diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:23:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:23:23 +1100 |
| commit | 3b5dd1f2e6af3bde24a82a7c78ec955741b87931 (patch) | |
| tree | 641e07b34b9f85fb62c2afb86fc3e8b38b7e1cc9 /arch | |
| parent | 6946ad78023f34e604ec480dd8f4da42926b60ce (diff) | |
| parent | 62f6d9b5d890c6dacf17e629d91085937990ccc0 (diff) | |
Merge remote-tracking branch 'kgdb/kgdb-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/kgdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index a4130005028a..3c2fb0f25abd 100644 --- 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; } |