Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[pandora-kernel.git] / arch / x86 / kernel / kgdb.c

diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 7c64c42..5f9ecff 100644 (file)
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -121,8 +121,8 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
                memcpy(mem, (void *)regs + dbg_reg_def[regno].offset,
                       dbg_reg_def[regno].size);
 
-       switch (regno) {
 #ifdef CONFIG_X86_32
+       switch (regno) {
        case GDB_SS:
                if (!user_mode_vm(regs))
                        *(unsigned long *)mem = __KERNEL_DS;
@@ -135,8 +135,8 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
        case GDB_FS:
                *(unsigned long *)mem = 0xFFFF;
                break;
-#endif
        }
+#endif
        return dbg_reg_def[regno].name;
 }
 
@@ -278,7 +278,7 @@ static int hw_break_release_slot(int breakno)
                pevent = per_cpu_ptr(breakinfo[breakno].pev, cpu);
                if (dbg_release_bp_slot(*pevent))
                        /*
-                        * The debugger is responisble for handing the retry on
+                        * The debugger is responsible for handing the retry on
                         * remove failure.
                         */
                        return -1;