Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue

[karo-tx-linux.git] / arch / powerpc / include / asm / processor.h

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index b43844442a6c1d236ab628487c298e50d166c627..75a9e5a34ef97dfea11c161555358d4a0b15caed 100644 (file)
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -188,7 +188,6 @@ struct debug_reg {
 
 struct thread_struct {
        unsigned long   ksp;            /* Kernel stack pointer */
-       unsigned long   ksp_limit;      /* if ksp <= ksp_limit stack overflow */
 
 #ifdef CONFIG_PPC64
        unsigned long   ksp_vsid;
@@ -201,6 +200,7 @@ struct thread_struct {
 #endif
 #ifdef CONFIG_PPC32
        void            *pgdir;         /* root of page-table tree */
+       unsigned long   ksp_limit;      /* if ksp <= ksp_limit stack overflow */
 #endif
        /* Debug Registers */
        struct debug_reg debug;
@@ -327,7 +327,6 @@ struct thread_struct {
 #else
 #define INIT_THREAD  { \
        .ksp = INIT_SP, \
-       .ksp_limit = INIT_SP_LIMIT, \
        .regs = (struct pt_regs *)INIT_SP - 1, /* XXX bogus, I think */ \
        .fs = KERNEL_DS, \
        .fpr = {{0}}, \