From linux-kernel@vger.kernel.org Thu Dec 18 21:45:37 2003 Date: Sun, 14 Dec 2003 05:52:29 +0000 From: Linux Kernel Mailing List To: bk-commits-24@vger.kernel.org Subject: [SPARC32]: Fix build after asm/system.h include was added to linux/spinlock.h ChangeSet 1.1270.1.7, 2003/12/13 21:52:29-08:00, davem@nuts.ninka.net [SPARC32]: Fix build after asm/system.h include was added to linux/spinlock.h - Do not include asm/oplib.h in system.h - Remove system.h's halt() macro, prom_halt() is equivalent so replace the two users of halt() with that. - Put 'romvec' extern decl where it belongs, in openprom.h Based upon a patch from Rob Radez. # This patch includes the following deltas: # ChangeSet 1.1270.1.6 -> 1.1270.1.7 # include/asm-sparc/openprom.h 1.1 -> 1.2 # include/asm-sparc/system.h 1.7 -> 1.8 # arch/sparc/kernel/devices.c 1.4 -> 1.5 # include/asm-sparc/oplib.h 1.3 -> 1.4 # arch/sparc/kernel/ioport.c 1.8 -> 1.9 # arch/sparc/kernel/devices.c | 2 +- arch/sparc/kernel/ioport.c | 2 +- include/asm-sparc/openprom.h | 2 ++ include/asm-sparc/oplib.h | 3 --- include/asm-sparc/system.h | 4 ---- 5 files changed, 4 insertions(+), 9 deletions(-) diff -Nru a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c --- a/arch/sparc/kernel/devices.c Mon Dec 15 07:03:40 2003 +++ b/arch/sparc/kernel/devices.c Mon Dec 15 07:03:40 2003 @@ -72,7 +72,7 @@ if (linux_num_cpus == 0) { printk("No CPU nodes found, cannot continue.\n"); /* Probably a sun4e, Sun is trying to trick us ;-) */ - halt(); + prom_halt(); } printk("Found %d CPU prom device tree node(s).\n", linux_num_cpus); } diff -Nru a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c --- a/arch/sparc/kernel/ioport.c Mon Dec 15 07:03:40 2003 +++ b/arch/sparc/kernel/ioport.c Mon Dec 15 07:03:40 2003 @@ -760,7 +760,7 @@ default: printk("ioport_init: cpu type %d is unknown.\n", sparc_cpu_model); - halt(); + prom_halt(); }; } diff -Nru a/include/asm-sparc/openprom.h b/include/asm-sparc/openprom.h --- a/include/asm-sparc/openprom.h Mon Dec 15 07:03:40 2003 +++ b/include/asm-sparc/openprom.h Mon Dec 15 07:03:40 2003 @@ -169,6 +169,8 @@ int (*v3_cpuresume)(unsigned int whichcpu); }; +extern struct linux_romvec *romvec; + /* Routines for traversing the prom device tree. */ struct linux_nodeops { int (*no_nextnode)(int node); diff -Nru a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h --- a/include/asm-sparc/oplib.h Mon Dec 15 07:03:40 2003 +++ b/include/asm-sparc/oplib.h Mon Dec 15 07:03:40 2003 @@ -11,9 +11,6 @@ #include #include -/* The master romvec pointer... */ -extern struct linux_romvec *romvec; - /* Enumeration to describe the prom major version we have detected. */ enum prom_major_version { PROM_V0, /* Original sun4c V0 prom */ diff -Nru a/include/asm-sparc/system.h b/include/asm-sparc/system.h --- a/include/asm-sparc/system.h Mon Dec 15 07:03:40 2003 +++ b/include/asm-sparc/system.h Mon Dec 15 07:03:40 2003 @@ -10,7 +10,6 @@ #ifdef __KERNEL__ #include -#include #include #include #include @@ -51,9 +50,6 @@ extern unsigned long empty_bad_page; extern unsigned long empty_bad_page_table; extern unsigned long empty_zero_page; - -extern struct linux_romvec *romvec; -#define halt() romvec->pv_halt() /* When a context switch happens we must flush all user windows so that * the windows of the current process are flushed onto its stack. This - To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html