aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2007-05-08 23:27:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 23:41:14 -0400
commit5616df204ecf164ef2b124a17fd3cadd87954628 (patch)
treeedddd0cacd41d3747a189795b453171d2a66a31b /arch
parent4b8df8915a6980f476e1fa8f4d156e36cb63bf76 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/frv/kernel/entry.S10
-rw-r--r--arch/frv/kernel/setup.c4
-rw-r--r--arch/frv/mm/elf-fdpic.c1
3 files changed, 13 insertions, 2 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:
1482 .long sys_faccessat 1482 .long sys_faccessat
1483 .long sys_pselect6 1483 .long sys_pselect6
1484 .long sys_ppoll 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
1487syscall_table_size = (. - sys_call_table) 1497syscall_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] = {
191static const struct clock_cmode __pminitdata *clock_cmodes; 191static const struct clock_cmode __pminitdata *clock_cmodes;
192static int __pminitdata clock_doubled; 192static int __pminitdata clock_doubled;
193 193
194static struct uart_port __initdata __frv_uart0 = { 194static struct uart_port __pminitdata __frv_uart0 = {
195 .uartclk = 0, 195 .uartclk = 0,
196 .membase = (char *) UART0_BASE, 196 .membase = (char *) UART0_BASE,
197 .irq = IRQ_CPU_UART0, 197 .irq = IRQ_CPU_UART0,
@@ -200,7 +200,7 @@ static struct uart_port __initdata __frv_uart0 = {
200 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, 200 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
201}; 201};
202 202
203static struct uart_port __initdata __frv_uart1 = { 203static struct uart_port __pminitdata __frv_uart1 = {
204 .uartclk = 0, 204 .uartclk = 0,
205 .membase = (char *) UART1_BASE, 205 .membase = (char *) UART1_BASE,
206 .irq = IRQ_CPU_UART1, 206 .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 @@
13#include <linux/mm.h> 13#include <linux/mm.h>
14#include <linux/fs.h> 14#include <linux/fs.h>
15#include <linux/elf-fdpic.h> 15#include <linux/elf-fdpic.h>
16#include <asm/mman.h>
16 17
17/*****************************************************************************/ 18/*****************************************************************************/
18/* 19/*