and changed files

[powerpc.git] / include / asm-powerpc / paca.h

diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index 0a4e5c9..c6a5b17 100644 (file)
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -70,6 +70,7 @@ struct paca_struct {
        s16 hw_cpu_id;                  /* Physical processor number */
        u8 cpu_start;                   /* At startup, processor spins until */
                                        /* this becomes non-zero. */
+       struct slb_shadow *slb_shadow_ptr;
 
        /*
         * Now, starting in cacheline 2, the exception save areas
@@ -82,8 +83,8 @@ struct paca_struct {
 
        mm_context_t context;
        u16 vmalloc_sllp;
-       u16 slb_cache[SLB_CACHE_ENTRIES];
        u16 slb_cache_ptr;
+       u16 slb_cache[SLB_CACHE_ENTRIES];
 
        /*
         * then miscellaneous read-write fields
@@ -93,15 +94,15 @@ struct paca_struct {
        u64 stab_rr;                    /* stab/slb round-robin counter */
        u64 saved_r1;                   /* r1 save for RTAS calls */
        u64 saved_msr;                  /* MSR saved here by enter_rtas */
-       u8 proc_enabled;                /* irq soft-enable flag */
+       u16 trap_save;                  /* Used when bad stack is encountered */
+       u8 soft_enabled;                /* irq soft-enable flag */
+       u8 hard_enabled;                /* set if irqs are enabled in MSR */
        u8 io_sync;                     /* writel() needs spin_unlock sync */
 
        /* Stuff for accurate time accounting */
        u64 user_time;                  /* accumulated usermode TB ticks */
        u64 system_time;                /* accumulated system TB ticks */
        u64 startpurr;                  /* PURR/TB value snapshot */
-
-       struct slb_shadow *slb_shadow_ptr;
 };
 
 extern struct paca_struct paca[];