smaps: only define clear_refs for CONFIG_MMU
PATCH 1/2 smaps: only define clear_refs for CONFIG_MMU
From: David Rientjes <[email protected]>
/proc/pid/clear_refs is only defined in the CONFIG_MMU case, so make sure we don't have any references to clear_refs_smap() in generic procfs code.
Signed-off-by David Rientjes <[email protected]>
Signed-off-by David Howells <[email protected]>
---
fs/proc/base.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/proc/base.c +2 -0
@@ -715,6 +715,7 @@ static const struct file_operations proc_oom_adjust_operations = { .write = oom_adjust_write, }; +#ifdef CONFIG_MMU static ssize_t clear_refs_write (struct file *file,const char __user *buf,size_t count,loff_t *ppos) {
@@ -748,6 +749,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,static struct file_operations proc_clear_refs_operations = { .write = clear_refs_write, }; +#endif #ifdef CONFIG_AUDITSYSCALL #define TMPBUFLEN 21
PATCH 2/2 FRV: Miscellaneous fixes
From: David Howells <[email protected]>
Miscellaneous fixes to bring FRV up to date:
(1) Copy the new syscall numbers from i386 to asm-frv/unistd.h and fill out the syscall table in entry.S too.
(2) Mark __frv_uart0 and __frv_uart1 __pminitdata rather than __initdata so that determine_clocks() can access them when CONFIG_PM=y.
(3) Make arch/frv/mm/elf-fdpic.c include asm/mman.h so that MAP_FIXED is
available (fixes commit 2fd3bebaad9da3b3b99c46a3389099424bf7ee35).
Signed-off-by David Howells <[email protected]>
---
arch/frv/kernel/entry.S | 10 ++++++++++ arch/frv/kernel/setup.c | 4 ++-- arch/frv/mm/elf-fdpic.c | 1 + include/asm-frv/unistd.h | 16 +++++++++++++--- 4 files changed, 26 insertions(+), 5 deletions(-)
arch/frv/kernel/entry.S +10 -0
@@ -1482,6 +1482,16 @@ sys_call_table: .long sys_faccessat .long sys_pselect6 .long sys_ppoll + .long sys_unshare /* 310 */ + .long sys_set_robust_list + .long sys_get_robust_list + .long sys_splice + .long sys_sync_file_range + .long sys_tee /* 315 */ + .long sys_vmsplice + .long sys_move_pages + .long sys_getcpu + .long sys_epoll_pwait syscall_table_size = (. - sys_call_table)
arch/frv/kernel/setup.c +2 -2
@@ -191,7 +191,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = { static const struct clock_cmode __pminitdata *clock_cmodes; static int __pminitdata clock_doubled; -static struct uart_port __initdata __frv_uart0 = { +static struct uart_port __pminitdata __frv_uart0 = { .uartclk =0 , .membase = (char *)UART0_BASE , .irq =IRQ_CPU_UART0 ,
@@ -200,7 +200,7 @@ static struct uart_port __initdata __frv_uart0 = { .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, }; -static struct uart_port __initdata __frv_uart1 = { +static struct uart_port __pminitdata __frv_uart1 = { .uartclk =0 , .membase = (char *)UART1_BASE , .irq =IRQ_CPU_UART1 ,
arch/frv/mm/elf-fdpic.c +1 -0
@@ -13,6 +13,7 @@#include <linux/mm.h> #include <linux/fs.h> #include <linux/elf-fdpic.h> +#include <asm/mman.h> /*****************************************************************************/ /*
include/asm-frv/unistd.h +13 -3
@@ -186,8 +186,8 @@#define __NR_rt_sigtimedwait 177#define __NR_rt_sigqueueinfo 178#define __NR_rt_sigsuspend 179 -#define __NR_pread 180 -#define __NR_pwrite 181 +#define __NR_pread64 180 +#define __NR_pwrite64 181#define __NR_chown 182#define __NR_getcwd 183#define __NR_capget 184
@@ -316,10 +316,20 @@#define __NR_faccessat 307#define __NR_pselect6 308#define __NR_ppoll 309 +#define __NR_unshare 310 +#define __NR_set_robust_list 311 +#define __NR_get_robust_list 312 +#define __NR_splice 313 +#define __NR_sync_file_range 314 +#define __NR_tee 315 +#define __NR_vmsplice 316 +#define __NR_move_pages 317 +#define __NR_getcpu 318 +#define __NR_epoll_pwait 319#ifdef __KERNEL__ -#define NR_syscalls 310 +#define NR_syscalls 320#define __ARCH_WANT_IPC_PARSE_VERSION/* #define __ARCH_WANT_OLD_READDIR */