Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[deliverable/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 14a658363698ee1d58e0b400b33b3bbc13475dda..47a35b08b9635ce375e266a6c12fd3b02869302b 100644 (file)
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -168,10 +168,10 @@ struct thread_struct {
         * The following help to manage the use of Debug Control Registers
         * om the BookE platforms.
         */
-       unsigned long   dbcr0;
-       unsigned long   dbcr1;
+       uint32_t        dbcr0;
+       uint32_t        dbcr1;
 #ifdef CONFIG_BOOKE
-       unsigned long   dbcr2;
+       uint32_t        dbcr2;
 #endif
        /*
         * The stored value of the DBSR register will be the value at the
@@ -179,7 +179,7 @@ struct thread_struct {
         * user (will never be written to) and has value while helping to
         * describe the reason for the last debug trap.  Torez
         */
-       unsigned long   dbsr;
+       uint32_t        dbsr;
        /*
         * The following will contain addresses used by debug applications
         * to help trace and trap on particular address locations.
@@ -200,7 +200,7 @@ struct thread_struct {
 #endif
 #endif
        /* FP and VSX 0-31 register set */
-       double          fpr[32][TS_FPRWIDTH];
+       double          fpr[32][TS_FPRWIDTH] __attribute__((aligned(16)));
        struct {
 
                unsigned int pad;
@@ -287,9 +287,9 @@ struct thread_struct {
        unsigned long   siar;
        unsigned long   sdar;
        unsigned long   sier;
-       unsigned long   mmcr0;
        unsigned long   mmcr2;
-       unsigned long   mmcra;
+       unsigned        mmcr0;
+       unsigned        used_ebb;
 #endif
 };
 
@@ -404,9 +404,7 @@ static inline void prefetchw(const void *x)
 
 #define spin_lock_prefetch(x)  prefetchw(x)
 
-#ifdef CONFIG_PPC64
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
-#endif
 
 #ifdef CONFIG_PPC64
 static inline unsigned long get_clean_sp(unsigned long sp, int is_32)