summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-03-23 13:31:29 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-03-23 13:31:29 +1100
commit673e8b6ea12a0fc0bf3dc192444a7b625a240e6f (patch)
treec5136a869fa854c4205f1c67f5c9346970235565 /arch
parentfe695b80fdd722f4ed5a7e461bbf3ce774890c3b (diff)
parent62f6d9b5d890c6dacf17e629d91085937990ccc0 (diff)
Merge remote-tracking branch 'kgdb/kgdb-next'
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/kgdb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index dba0b36941a5..5f9ecff328b5 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;
}