Commit 5616df204ecf164ef2b124a17fd3cadd87954628
Committed by
Linus Torvalds
Linus Torvalds
1 parent
4b8df8915a
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>
Showing 4 changed files with 26 additions and 5 deletions Side-by-side Diff
arch/frv/kernel/entry.S
| ... | ... | @@ -1482,6 +1482,16 @@ |
| 1482 | 1482 | .long sys_faccessat |
| 1483 | 1483 | .long sys_pselect6 |
| 1484 | 1484 | .long sys_ppoll |
| 1485 | + .long sys_unshare /* 310 */ | |
| 1486 | + .long sys_set_robust_list | |
| 1487 | + .long sys_get_robust_list | |
| 1488 | + .long sys_splice | |
| 1489 | + .long sys_sync_file_range | |
| 1490 | + .long sys_tee /* 315 */ | |
| 1491 | + .long sys_vmsplice | |
| 1492 | + .long sys_move_pages | |
| 1493 | + .long sys_getcpu | |
| 1494 | + .long sys_epoll_pwait | |
| 1485 | 1495 | |
| 1486 | 1496 | |
| 1487 | 1497 | syscall_table_size = (. - sys_call_table) |
arch/frv/kernel/setup.c
| ... | ... | @@ -191,7 +191,7 @@ |
| 191 | 191 | static const struct clock_cmode __pminitdata *clock_cmodes; |
| 192 | 192 | static int __pminitdata clock_doubled; |
| 193 | 193 | |
| 194 | -static struct uart_port __initdata __frv_uart0 = { | |
| 194 | +static struct uart_port __pminitdata __frv_uart0 = { | |
| 195 | 195 | .uartclk = 0, |
| 196 | 196 | .membase = (char *) UART0_BASE, |
| 197 | 197 | .irq = IRQ_CPU_UART0, |
| ... | ... | @@ -200,7 +200,7 @@ |
| 200 | 200 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 201 | 201 | }; |
| 202 | 202 | |
| 203 | -static struct uart_port __initdata __frv_uart1 = { | |
| 203 | +static struct uart_port __pminitdata __frv_uart1 = { | |
| 204 | 204 | .uartclk = 0, |
| 205 | 205 | .membase = (char *) UART1_BASE, |
| 206 | 206 | .irq = IRQ_CPU_UART1, |
arch/frv/mm/elf-fdpic.c
include/asm-frv/unistd.h
| ... | ... | @@ -186,8 +186,8 @@ |
| 186 | 186 | #define __NR_rt_sigtimedwait 177 |
| 187 | 187 | #define __NR_rt_sigqueueinfo 178 |
| 188 | 188 | #define __NR_rt_sigsuspend 179 |
| 189 | -#define __NR_pread 180 | |
| 190 | -#define __NR_pwrite 181 | |
| 189 | +#define __NR_pread64 180 | |
| 190 | +#define __NR_pwrite64 181 | |
| 191 | 191 | #define __NR_chown 182 |
| 192 | 192 | #define __NR_getcwd 183 |
| 193 | 193 | #define __NR_capget 184 |
| 194 | 194 | |
| ... | ... | @@ -316,10 +316,20 @@ |
| 316 | 316 | #define __NR_faccessat 307 |
| 317 | 317 | #define __NR_pselect6 308 |
| 318 | 318 | #define __NR_ppoll 309 |
| 319 | +#define __NR_unshare 310 | |
| 320 | +#define __NR_set_robust_list 311 | |
| 321 | +#define __NR_get_robust_list 312 | |
| 322 | +#define __NR_splice 313 | |
| 323 | +#define __NR_sync_file_range 314 | |
| 324 | +#define __NR_tee 315 | |
| 325 | +#define __NR_vmsplice 316 | |
| 326 | +#define __NR_move_pages 317 | |
| 327 | +#define __NR_getcpu 318 | |
| 328 | +#define __NR_epoll_pwait 319 | |
| 319 | 329 | |
| 320 | 330 | #ifdef __KERNEL__ |
| 321 | 331 | |
| 322 | -#define NR_syscalls 310 | |
| 332 | +#define NR_syscalls 320 | |
| 323 | 333 | |
| 324 | 334 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 325 | 335 | /* #define __ARCH_WANT_OLD_READDIR */ |