summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/setup.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /arch/sparc64/kernel/setup.c
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
-rw-r--r--arch/sparc64/kernel/setup.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 0f280f818..ed2e8bd81 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.50 1999/12/01 10:44:45 davem Exp $
+/* $Id: setup.c,v 1.51 2000/02/26 04:24:32 davem Exp $
* linux/arch/sparc64/kernel/setup.c
*
* Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu)
@@ -451,6 +451,8 @@ void register_prom_callbacks(void)
"' linux-.soft2 to .soft2");
}
+extern void paging_init(void);
+
void __init setup_arch(char **cmdline_p)
{
extern int serial_console; /* in console.c, of course */
@@ -587,6 +589,8 @@ void __init setup_arch(char **cmdline_p)
#endif
if (serial_console)
conswitchp = NULL;
+
+ paging_init();
}
asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on)