diff options
| author | David Howells <dhowells@redhat.com> | 2007-05-08 20:27:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:41:14 -0700 |
| commit | 5616df204ecf164ef2b124a17fd3cadd87954628 (patch) | |
| tree | edddd0cacd41d3747a189795b453171d2a66a31b | |
| parent | 4b8df8915a6980f476e1fa8f4d156e36cb63bf76 (diff) | |
| download | linux-5616df204ecf164ef2b124a17fd3cadd87954628.tar.bz2 | |
FRV: Miscellaneous fixes
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 <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/frv/kernel/entry.S | 10 | ||||
| -rw-r--r-- | arch/frv/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/frv/mm/elf-fdpic.c | 1 | ||||
| -rw-r--r-- | include/asm-frv/unistd.h | 16 |
4 files changed, 26 insertions, 5 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 940ac306e9a0..43dc08ec7511 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S @@ -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) diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 8ea3ca2aba62..aa3c795d5354 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -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, diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c index cac2c01a3a56..385fd30b142f 100644 --- a/arch/frv/mm/elf-fdpic.c +++ b/arch/frv/mm/elf-fdpic.c @@ -13,6 +13,7 @@ #include <linux/mm.h> #include <linux/fs.h> #include <linux/elf-fdpic.h> +#include <asm/mman.h> /*****************************************************************************/ /* diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h index 584c0417ae4d..d0ea6789b31e 100644 --- a/include/asm-frv/unistd.h +++ b/include/asm-frv/unistd.h @@ -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 */ |