Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

2 files changed, 1 insertions, 11 deletions

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index c51d08d218ef..267ec8f6fb58 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -38,7 +38,7 @@
 
 #define curptr      g6
 
-#define NR_SYSCALLS 284      /* Each OS is different... */
+#define NR_SYSCALLS 299      /* Each OS is different... */
 
 /* These are just handy. */
 #define _SV     save    %sp, -STACKFRAME_SZ, %sp
diff --git a/arch/sparc/math-emu/math.c b/arch/sparc/math-emu/math.c
index be2c80932e26..8613b3eb877c 100644
--- a/arch/sparc/math-emu/math.c
+++ b/arch/sparc/math-emu/math.c
@@ -323,11 +323,6 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs)
                 case FMOVS:
                 case FABSS:
                 case FNEGS: TYPE(2,1,0,1,0,0,0); break;
-                default:
-#ifdef DEBUG_MATHEMU
-                        printk("unknown FPop1: %03lx\n",(insn>>5)&0x1ff);
-#endif
-                        break;
                 }
         } else if ((insn & 0xc1f80000) == 0x81a80000)   /* FPOP2 */ {
                 switch ((insn >> 5) & 0x1ff) {
@@ -337,11 +332,6 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs)
                 case FCMPED: TYPE(3,0,0,2,1,2,1); break;
                 case FCMPQ: TYPE(3,0,0,3,1,3,1); break;
                 case FCMPEQ: TYPE(3,0,0,3,1,3,1); break;
-                default:
-#ifdef DEBUG_MATHEMU
-                        printk("unknown FPop2: %03lx\n",(insn>>5)&0x1ff);
-#endif
-                        break;
                 }
         }