[Linux-mips-commits]CVS: linux/arch/mips/kernel Makefile,1.13,1.14 pci-dma.c,1.5,1.6 smp.c,1.4,1.5 traps.c,1.22,1.23

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips/kernel

Modified Files:
	Makefile pci-dma.c smp.c traps.c 
Log Message:
Sync with OSS 2.4.11.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	2001/10/27 20:52:05	1.13
+++ Makefile	2001/11/06 00:30:42	1.14
@@ -15,7 +15,7 @@
 
 O_TARGET := kernel.o
 
-export-objs			= pci-dma.o smp.o
+export-objs			= pci-dma.o smp.o mips_ksyms.o
 
 obj-y				+= branch.o process.o signal.o entry.o \
 				   traps.o ptrace.o vm86.o ioport.o reset.o \

Index: pci-dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci-dma.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pci-dma.c	2001/10/27 20:40:12	1.5
+++ pci-dma.c	2001/11/06 00:30:42	1.6
@@ -8,9 +8,9 @@
  * swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
  */
 #include <linux/config.h>
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/pci.h>
 

Index: smp.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/smp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smp.c	2001/10/11 22:17:20	1.4
+++ smp.c	2001/11/06 00:30:42	1.5
@@ -48,7 +48,8 @@
 /* Ze Big Kernel Lock! */
 spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
 int smp_threads_ready;  /* Not used */
-int smp_num_cpus;    
+int smp_num_cpus;    			/* Number that came online.  */
+cpumask_t cpu_online_map;		/* Bitmask of currently online CPUs */
 int global_irq_holder = NO_PROC_ID;
 spinlock_t global_irq_lock = SPIN_LOCK_UNLOCKED;
 struct cpuinfo_mips cpu_data[NR_CPUS];

Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/traps.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- traps.c	2001/10/24 23:32:54	1.22
+++ traps.c	2001/11/06 00:30:42	1.23
@@ -223,8 +223,9 @@
 	/*
 	 * Saved cp0 registers
 	 */
-	printk("epc  : %08lx\nStatus: %08x\nCause : %08x\n",
-	       regs->cp0_epc, regs->cp0_status, regs->cp0_cause);
+	printk("epc  : %08lx    %s\nStatus: %08x\nCause : %08x\n",
+	       regs->cp0_epc, print_tainted(), regs->cp0_status,
+	       regs->cp0_cause);
 }
 
 spinlock_t die_lock;