1 files changed, 11 insertions, 9 deletions

diff --git a/arch/x86/include/asm/kgdb.h b/arch/x86/include/asm/kgdb.h
index 006da3687cdc..396f5b5fc4d7 100644
--- a/arch/x86/include/asm/kgdb.h
+++ b/arch/x86/include/asm/kgdb.h
@@ -39,9 +39,11 @@ enum regnames {
         GDB_FS,                 /* 14 */
         GDB_GS,                 /* 15 */
 };
+#define GDB_ORIG_AX             41
+#define DBG_MAX_REG_NUM         16
 #define NUMREGBYTES             ((GDB_GS+1)*4)
 #else /* ! CONFIG_X86_32 */
-enum regnames64 {
+enum regnames {
         GDB_AX,                 /* 0 */
         GDB_BX,                 /* 1 */
         GDB_CX,                 /* 2 */
@@ -59,15 +61,15 @@ enum regnames64 {
         GDB_R14,                /* 14 */
         GDB_R15,                /* 15 */
         GDB_PC,                 /* 16 */
+        GDB_PS,                 /* 17 */
+        GDB_CS,                 /* 18 */
+        GDB_SS,                 /* 19 */
 };
-
-enum regnames32 {
-        GDB_PS = 34,
-        GDB_CS,
-        GDB_SS,
-};
-#define NUMREGBYTES             ((GDB_SS+1)*4)
-#endif /* CONFIG_X86_32 */
+#define GDB_ORIG_AX             57
+#define DBG_MAX_REG_NUM         20
+/* 17 64 bit regs and 3 32 bit regs */
+#define NUMREGBYTES             ((17 * 8) + (3 * 4))
+#endif /* ! CONFIG_X86_32 */
 
 static inline void arch_kgdb_breakpoint(void)
 {