[Linux-mips-commits]CVS: linux/arch/mips64/kernel Makefile,1.5,1.6 ioctl32.c,1.3,1.4 mips64_ksyms.c,1.6,1.7 proc.c,1.10,1.11 smp.c,1.15,1.16 traps.c,1.14,1.15

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

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

Modified Files:
	Makefile ioctl32.c mips64_ksyms.c proc.c smp.c traps.c 
Log Message:
More OSS syncing..



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	26 Feb 2002 16:36:12 -0000	1.5
+++ Makefile	21 Apr 2002 20:01:14 -0000	1.6
@@ -16,9 +16,8 @@
 export-objs = irq.o mips64_ksyms.o pci-dma.o smp.o
 
 obj-y	:= branch.o entry.o irq.o proc.o process.o ptrace.o r4k_cache.o \
-	   r4k_fpu.o r4k_genex.o r4k_switch.o reset.o scall_64.o \
-	   semaphore.o setup.o signal.o softfp.o syscall.o time.o traps.o \
-	   unaligned.o
+	   r4k_fpu.o r4k_genex.o r4k_switch.o reset.o scall_64.o semaphore.o \
+	   setup.o signal.o syscall.o time.o traps.o unaligned.o
 
 obj-$(CONFIG_I8259)		+= i8259.o
 obj-$(CONFIG_IRQ_CPU)		+= irq_cpu.o

Index: ioctl32.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/ioctl32.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ioctl32.c	2 Jan 2002 19:13:41 -0000	1.3
+++ ioctl32.c	21 Apr 2002 20:01:14 -0000	1.4
@@ -14,7 +14,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/mtio.h>
-#include <linux/tty.h>
 #include <linux/init.h>
 #include <linux/file.h>
 #include <linux/vt.h>
@@ -32,8 +31,6 @@
 #undef __KERNEL__		/* This file was born to be ugly ...  */
 #include <scsi/scsi_ioctl.h>
 #define __KERNEL__
-
-#include <asm/ioctls.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
 

Index: mips64_ksyms.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/mips64_ksyms.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mips64_ksyms.c	26 Feb 2002 19:03:28 -0000	1.6
+++ mips64_ksyms.c	21 Apr 2002 20:01:14 -0000	1.7
@@ -105,12 +105,6 @@
 int register_fpe(void (*handler)(struct pt_regs *regs, unsigned int fcr31));
 int unregister_fpe(void (*handler)(struct pt_regs *regs, unsigned int fcr31));
 
-#ifdef CONFIG_MIPS_FPE_MODULE
-EXPORT_SYMBOL(__compute_return_epc);
-EXPORT_SYMBOL(register_fpe);
-EXPORT_SYMBOL(unregister_fpe);
-#endif
-
 #ifdef CONFIG_VT
 EXPORT_SYMBOL(screen_info);
 #endif

Index: proc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/proc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- proc.c	4 Jan 2002 18:04:53 -0000	1.10
+++ proc.c	21 Apr 2002 20:01:14 -0000	1.11
@@ -77,7 +77,7 @@
 	char fmt [64];
 
 #ifdef CONFIG_SMP
-	if (!(cpu_online_map & (1<<n)))
+	if (!CPUMASK_TSTB(cpu_online_map, n))
 		return 0;
 #endif
 

Index: smp.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/smp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- smp.c	26 Feb 2002 17:34:15 -0000	1.15
+++ smp.c	21 Apr 2002 20:01:14 -0000	1.16
@@ -299,6 +299,7 @@
 	local_flush_tlb_page(vma, page);
 }
 
+EXPORT_SYMBOL(smp_num_cpus);
 EXPORT_SYMBOL(flush_tlb_page);
 EXPORT_SYMBOL(cpu_data);
 EXPORT_SYMBOL(synchronize_irq);

Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/traps.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- traps.c	26 Feb 2002 17:34:15 -0000	1.14
+++ traps.c	21 Apr 2002 20:01:14 -0000	1.15
@@ -334,26 +334,6 @@
 	force_sig(SIGFPE, current);
 }
 
-#ifdef CONFIG_MIPS_FPE_MODULE
-static void (*fpe_handler)(struct pt_regs *regs, unsigned int fcr31);
-
-/*
- * Register_fpe/unregister_fpe are for debugging purposes only.  To make
- * this hack work a bit better there is no error checking.
- */
-int register_fpe(void (*handler)(struct pt_regs *regs, unsigned int fcr31))
-{
-	fpe_handler = handler;
-	return 0;
-}
-
-int unregister_fpe(void (*handler)(struct pt_regs *regs, unsigned int fcr31))
-{
-	fpe_handler = NULL;
-	return 0;
-}
-#endif
-
 /*
  * XXX Delayed fp exceptions when doing a lazy ctx switch XXX
  */
@@ -363,12 +343,6 @@
 	unsigned int insn;
 	extern void simfp(unsigned int);
 
-#ifdef CONFIG_MIPS_FPE_MODULE
-	if (fpe_handler != NULL) {
-		fpe_handler(regs, fcr31);
-		return;
-	}
-#endif
 	if (fcr31 & 0x20000) {
 		/* Retry instruction with flush to zero ...  */
 		if (!(fcr31 & (1<<24))) {