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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  kdb: add usage string of 'per_cpu' command
  kgdb,x86_64: fix compile warning found with sparse
  kdb: code cleanup to use macro instead of value
  kgdboc,kgdbts: strlen() doesn't count the terminator

diff --combined arch/x86/kernel/kgdb.c
index dba0b36941a51b6e9d85be0d5011b8f309e19369,3c2fb0f25abd063f177fb80a13e0e77070f0fa0f..5f9ecff328b5f9604eb4d053e21b19c7d2618c88
--- 1/arch/x86/kernel/kgdb.c
--- 2/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@@ -121,8 -121,8 +121,8 @@@ char *dbg_get_reg(int regno, void *mem
                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 +135,8 @@@
        case GDB_FS:
                *(unsigned long *)mem = 0xFFFF;
                break;
- #endif
        }
+ #endif
        return dbg_reg_def[regno].name;
  }
  
@@@ -278,7 -278,7 +278,7 @@@ static int hw_break_release_slot(int br
                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;
@@@ -533,6 -533,15 +533,6 @@@ static int __kgdb_notify(struct die_arg
                }
                return NOTIFY_DONE;
  
 -      case DIE_NMIWATCHDOG:
 -              if (atomic_read(&kgdb_active) != -1) {
 -                      /* KGDB CPU roundup: */
 -                      kgdb_nmicallback(raw_smp_processor_id(), regs);
 -                      return NOTIFY_STOP;
 -              }
 -              /* Enter debugger: */
 -              break;
 -
        case DIE_DEBUG:
                if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
                        if (user_mode(regs))