Merge tag 'regmap-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / include / asm / cpu_entry_area.h

diff --git a/arch/x86/include/asm/cpu_entry_area.h b/arch/x86/include/asm/cpu_entry_area.h
index 02c0078..8902fdb 100644 (file)
--- a/arch/x86/include/asm/cpu_entry_area.h
+++ b/arch/x86/include/asm/cpu_entry_area.h
@@ -11,15 +11,11 @@
 #ifdef CONFIG_X86_64
 
 /* Macro to enforce the same ordering and stack sizes */
-#define ESTACKS_MEMBERS(guardsize, db2_holesize)\
+#define ESTACKS_MEMBERS(guardsize)             \
        char    DF_stack_guard[guardsize];      \
        char    DF_stack[EXCEPTION_STKSZ];      \
        char    NMI_stack_guard[guardsize];     \
        char    NMI_stack[EXCEPTION_STKSZ];     \
-       char    DB2_stack_guard[guardsize];     \
-       char    DB2_stack[db2_holesize];        \
-       char    DB1_stack_guard[guardsize];     \
-       char    DB1_stack[EXCEPTION_STKSZ];     \
        char    DB_stack_guard[guardsize];      \
        char    DB_stack[EXCEPTION_STKSZ];      \
        char    MCE_stack_guard[guardsize];     \
@@ -28,12 +24,12 @@
 
 /* The exception stacks' physical storage. No guard pages required */
 struct exception_stacks {
-       ESTACKS_MEMBERS(0, 0)
+       ESTACKS_MEMBERS(0)
 };
 
 /* The effective cpu entry area mapping with guard pages. */
 struct cea_exception_stacks {
-       ESTACKS_MEMBERS(PAGE_SIZE, EXCEPTION_STKSZ)
+       ESTACKS_MEMBERS(PAGE_SIZE)
 };
 
 /*
@@ -42,8 +38,6 @@ struct cea_exception_stacks {
 enum exception_stack_ordering {
        ESTACK_DF,
        ESTACK_NMI,
-       ESTACK_DB2,
-       ESTACK_DB1,
        ESTACK_DB,
        ESTACK_MCE,
        N_EXCEPTION_STACKS