Commit 5616df20 authored by David Howells's avatar David Howells Committed by Linus Torvalds

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 2fd3beba).
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b8df891
...@@ -1482,6 +1482,16 @@ sys_call_table: ...@@ -1482,6 +1482,16 @@ sys_call_table:
.long sys_faccessat .long sys_faccessat
.long sys_pselect6 .long sys_pselect6
.long sys_ppoll .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) syscall_table_size = (. - sys_call_table)
...@@ -191,7 +191,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = { ...@@ -191,7 +191,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = {
static const struct clock_cmode __pminitdata *clock_cmodes; static const struct clock_cmode __pminitdata *clock_cmodes;
static int __pminitdata clock_doubled; static int __pminitdata clock_doubled;
static struct uart_port __initdata __frv_uart0 = { static struct uart_port __pminitdata __frv_uart0 = {
.uartclk = 0, .uartclk = 0,
.membase = (char *) UART0_BASE, .membase = (char *) UART0_BASE,
.irq = IRQ_CPU_UART0, .irq = IRQ_CPU_UART0,
...@@ -200,7 +200,7 @@ static struct uart_port __initdata __frv_uart0 = { ...@@ -200,7 +200,7 @@ static struct uart_port __initdata __frv_uart0 = {
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
}; };
static struct uart_port __initdata __frv_uart1 = { static struct uart_port __pminitdata __frv_uart1 = {
.uartclk = 0, .uartclk = 0,
.membase = (char *) UART1_BASE, .membase = (char *) UART1_BASE,
.irq = IRQ_CPU_UART1, .irq = IRQ_CPU_UART1,
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/elf-fdpic.h> #include <linux/elf-fdpic.h>
#include <asm/mman.h>
/*****************************************************************************/ /*****************************************************************************/
/* /*
......
...@@ -186,8 +186,8 @@ ...@@ -186,8 +186,8 @@
#define __NR_rt_sigtimedwait 177 #define __NR_rt_sigtimedwait 177
#define __NR_rt_sigqueueinfo 178 #define __NR_rt_sigqueueinfo 178
#define __NR_rt_sigsuspend 179 #define __NR_rt_sigsuspend 179
#define __NR_pread 180 #define __NR_pread64 180
#define __NR_pwrite 181 #define __NR_pwrite64 181
#define __NR_chown 182 #define __NR_chown 182
#define __NR_getcwd 183 #define __NR_getcwd 183
#define __NR_capget 184 #define __NR_capget 184
...@@ -316,10 +316,20 @@ ...@@ -316,10 +316,20 @@
#define __NR_faccessat 307 #define __NR_faccessat 307
#define __NR_pselect6 308 #define __NR_pselect6 308
#define __NR_ppoll 309 #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__ #ifdef __KERNEL__
#define NR_syscalls 310 #define NR_syscalls 320
#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_IPC_PARSE_VERSION
/* #define __ARCH_WANT_OLD_READDIR */ /* #define __ARCH_WANT_OLD_READDIR */
......
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