[PATCH] Remove most of the special cases for the debug IST stack

Remove most of the special cases for the debug IST stack.  This is a
follow on clean up patch, it requires the bug fix patch that adds
orig_ist.

Signed-off-by: Keith Owens <kaos@ocs.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>

1 files changed, 5 insertions, 16 deletions

diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 491361752c70..9332d2361e08 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -237,28 +237,17 @@ void __cpuinit cpu_init (void)
          * set up and load the per-CPU TSS
          */
         for (v = 0; v < N_EXCEPTION_STACKS; v++) {
+                static const unsigned int order[N_EXCEPTION_STACKS] = {
+                        [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
+                        [DEBUG_STACK - 1] = DEBUG_STACK_ORDER
+                };
                 if (cpu) {
-                        static const unsigned int order[N_EXCEPTION_STACKS] = {
-                                [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
-                                [DEBUG_STACK - 1] = DEBUG_STACK_ORDER
-                        };
-
                         estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);
                         if (!estacks)
                                 panic("Cannot allocate exception stack %ld %d\n",
                                       v, cpu); 
                 }
-                switch (v + 1) {
-#if DEBUG_STKSZ > EXCEPTION_STKSZ
-                case DEBUG_STACK:
-                        cpu_pda(cpu)->debugstack = (unsigned long)estacks;
-                        estacks += DEBUG_STKSZ;
-                        break;
-#endif
-                default:
-                        estacks += EXCEPTION_STKSZ;
-                        break;
-                }
+                estacks += PAGE_SIZE << order[v];
                 orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
         }