Commit 0ff2df7e authored by Anton Blanchard's avatar Anton Blanchard

ppc64: Remove sys32_mremap, not required on ppc64 since we alter TASK_SIZE

parent 4d8c3efd
...@@ -26,7 +26,12 @@ CONFIG_LOG_BUF_SHIFT=15 ...@@ -26,7 +26,12 @@ CONFIG_LOG_BUF_SHIFT=15
# #
# Loadable module support # Loadable module support
# #
# CONFIG_MODULES is not set CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
# CONFIG_KMOD is not set
# #
# Platform support # Platform support
...@@ -256,6 +261,7 @@ CONFIG_NETDEVICES=y ...@@ -256,6 +261,7 @@ CONFIG_NETDEVICES=y
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
# #
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_OAKNET is not set # CONFIG_OAKNET is not set
# CONFIG_HAPPYMEAL is not set # CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set # CONFIG_SUNGEM is not set
...@@ -452,6 +458,7 @@ CONFIG_HVC_CONSOLE=y ...@@ -452,6 +458,7 @@ CONFIG_HVC_CONSOLE=y
# CONFIG_AGP is not set # CONFIG_AGP is not set
# CONFIG_DRM is not set # CONFIG_DRM is not set
CONFIG_RAW_DRIVER=y CONFIG_RAW_DRIVER=y
# CONFIG_HANGCHECK_TIMER is not set
# #
# Multimedia devices # Multimedia devices
......
...@@ -666,7 +666,7 @@ _GLOBAL(sys_call_table32) ...@@ -666,7 +666,7 @@ _GLOBAL(sys_call_table32)
.llong .sys32_sched_get_priority_min /* 160 */ .llong .sys32_sched_get_priority_min /* 160 */
.llong .sys32_sched_rr_get_interval .llong .sys32_sched_rr_get_interval
.llong .compat_sys_nanosleep .llong .compat_sys_nanosleep
.llong .sys32_mremap .llong .sys_mremap
.llong .sys_setresuid .llong .sys_setresuid
.llong .sys_getresuid /* 165 */ .llong .sys_getresuid /* 165 */
.llong .sys_ni_syscall /* old query_module syscall */ .llong .sys_ni_syscall /* old query_module syscall */
......
...@@ -819,45 +819,6 @@ asmlinkage long sys32_sysfs(u32 option, u32 arg1, u32 arg2) ...@@ -819,45 +819,6 @@ asmlinkage long sys32_sysfs(u32 option, u32 arg1, u32 arg2)
return sys_sysfs((int)option, arg1, arg2); return sys_sysfs((int)option, arg1, arg2);
} }
extern unsigned long do_mremap(unsigned long addr,
unsigned long old_len, unsigned long new_len,
unsigned long flags, unsigned long new_addr);
asmlinkage unsigned long sys32_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len,
unsigned long flags, u32 __new_addr)
{
unsigned long ret = -EINVAL;
unsigned long new_addr = AA(__new_addr);
if (old_len > 0xf0000000UL || new_len > 0xf0000000UL)
goto out;
if (addr > 0xf0000000UL - old_len)
goto out;
down_write(&current->mm->mmap_sem);
if (flags & MREMAP_FIXED) {
if (new_addr > 0xf0000000UL - new_len)
goto out_sem;
} else if (addr > 0xf0000000UL - new_len) {
ret = -ENOMEM;
if (!(flags & MREMAP_MAYMOVE))
goto out_sem;
new_addr = get_unmapped_area (NULL, addr, new_len, 0, 0);
if (!new_addr)
goto out_sem;
flags |= MREMAP_FIXED;
}
ret = do_mremap(addr, old_len, new_len, flags, new_addr);
out_sem:
up_write(&current->mm->mmap_sem);
out:
return ret;
}
/* Handle adjtimex compatability. */ /* Handle adjtimex compatability. */
struct timex32 { struct timex32 {
u32 modes; u32 modes;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment