Commit b090abd1 authored by Ben Collins's avatar Ben Collins

Merge http://linux.bkbits.net/linux-2.5

into debian.org:/usr/src/kernel/sparc-2.6
parents 0672b0ba e4e2cff8
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#endif #endif
#ifdef CONFIG_SUN3X #ifdef CONFIG_SUN3X
#include <asm/dvma.h> #include <asm/dvma.h>
extern void sun_serial_setup(void);
#endif #endif
unsigned long m68k_machtype; unsigned long m68k_machtype;
......
...@@ -233,7 +233,6 @@ extern char cputypval; ...@@ -233,7 +233,6 @@ extern char cputypval;
extern unsigned long start, end; extern unsigned long start, end;
extern void panic_setup(char *, int *); extern void panic_setup(char *, int *);
extern void srmmu_end_memory(unsigned long, unsigned long *); extern void srmmu_end_memory(unsigned long, unsigned long *);
extern void sun_serial_setup(void);
extern unsigned short root_flags; extern unsigned short root_flags;
extern unsigned short root_dev; extern unsigned short root_dev;
......
...@@ -1423,7 +1423,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) ...@@ -1423,7 +1423,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
/* paging_init() sets up the page tables */ /* paging_init() sets up the page tables */
extern void sun_serial_setup(void);
extern void cheetah_ecache_flush_init(void); extern void cheetah_ecache_flush_init(void);
static unsigned long last_valid_pfn; static unsigned long last_valid_pfn;
...@@ -1548,15 +1547,6 @@ void __init paging_init(void) ...@@ -1548,15 +1547,6 @@ void __init paging_init(void)
inherit_locked_prom_mappings(1); inherit_locked_prom_mappings(1);
#ifdef CONFIG_SUN_SERIAL
/* This does not logically belong here, but we need to call it at
* the moment we are able to use the bootmem allocator. This _has_
* to be done after the prom_mappings above so since
* __alloc_bootmem() doesn't work correctly until then.
*/
sun_serial_setup();
#endif
/* We only created DTLB mapping of this stuff. */ /* We only created DTLB mapping of this stuff. */
spitfire_flush_dtlb_nucleus_page(alias_base); spitfire_flush_dtlb_nucleus_page(alias_base);
if (second_alias_page) if (second_alias_page)
......
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