diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:01:48 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:01:48 +1100 |
| commit | ff718c24b6948b150c0746fb037983467facdc68 (patch) | |
| tree | 1753bf0dd6fefa277a3554e49a936a80fc8e1365 /arch | |
| parent | 08800d076b2eeb92079c522ce088452a3a58d345 (diff) | |
| parent | 651b02233b5599e53732f282d87163e108456f34 (diff) | |
Merge remote 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 cd21b654dec6..04a1ea916d70 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -120,8 +120,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; @@ -134,8 +134,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; } |