diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 08:26:41 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 08:26:41 +0100 |
| commit | d60cf53a30956e47919788b2ef49287786a959c9 (patch) | |
| tree | cb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /arch/powerpc/include/asm/mmu-book3e.h | |
| parent | sh: sh7750: Fix incompatible pointer type (diff) | |
| parent | sh: Change __nosave_XXX symbols to long (diff) | |
| download | linux-d60cf53a30956e47919788b2ef49287786a959c9.tar.xz linux-d60cf53a30956e47919788b2ef49287786a959c9.zip | |
Merge branch 'sh/st-integration' into sh/urgent
Diffstat (limited to 'arch/powerpc/include/asm/mmu-book3e.h')
| -rw-r--r-- | arch/powerpc/include/asm/mmu-book3e.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h index 8eaed81ea642..17194fcd4040 100644 --- a/arch/powerpc/include/asm/mmu-book3e.h +++ b/arch/powerpc/include/asm/mmu-book3e.h @@ -40,8 +40,8 @@ /* MAS registers bit definitions */ -#define MAS0_TLBSEL(x) ((x << 28) & 0x30000000) -#define MAS0_ESEL(x) ((x << 16) & 0x0FFF0000) +#define MAS0_TLBSEL(x) (((x) << 28) & 0x30000000) +#define MAS0_ESEL(x) (((x) << 16) & 0x0FFF0000) #define MAS0_NV(x) ((x) & 0x00000FFF) #define MAS0_HES 0x00004000 #define MAS0_WQ_ALLWAYS 0x00000000 @@ -50,12 +50,12 @@ #define MAS1_VALID 0x80000000 #define MAS1_IPROT 0x40000000 -#define MAS1_TID(x) ((x << 16) & 0x3FFF0000) +#define MAS1_TID(x) (((x) << 16) & 0x3FFF0000) #define MAS1_IND 0x00002000 #define MAS1_TS 0x00001000 #define MAS1_TSIZE_MASK 0x00000f80 #define MAS1_TSIZE_SHIFT 7 -#define MAS1_TSIZE(x) ((x << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK) +#define MAS1_TSIZE(x) (((x) << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK) #define MAS2_EPN 0xFFFFF000 #define MAS2_X0 0x00000040 |