From 5616df204ecf164ef2b124a17fd3cadd87954628 Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 8 May 2007 20:27:02 -0700 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/frv/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/frv/kernel/setup.c') 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, -- cgit v1.2.3