diff options
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/mm/pgtable.c | 5 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc85xx_rio.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c index 354a9408f024..82b06a1ef95d 100644 --- a/arch/ppc/mm/pgtable.c +++ b/arch/ppc/mm/pgtable.c | |||
@@ -313,11 +313,8 @@ void __init mapin_ram(void) | |||
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | /* is x a power of 2? */ | ||
317 | #define is_power_of_2(x) ((x) != 0 && (((x) & ((x) - 1)) == 0)) | ||
318 | |||
319 | /* is x a power of 4? */ | 316 | /* is x a power of 4? */ |
320 | #define is_power_of_4(x) ((x) != 0 && (((x) & (x-1)) == 0) && (ffs(x) & 1)) | 317 | #define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)) |
321 | 318 | ||
322 | /* | 319 | /* |
323 | * Set up a mapping for a block of I/O. | 320 | * Set up a mapping for a block of I/O. |
diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c index 05b0e9415085..2b097800cdd9 100644 --- a/arch/ppc/syslib/ppc85xx_rio.c +++ b/arch/ppc/syslib/ppc85xx_rio.c | |||
@@ -59,8 +59,6 @@ | |||
59 | #define DBELL_TID(x) (*(u8 *)(x + DOORBELL_TID_OFFSET)) | 59 | #define DBELL_TID(x) (*(u8 *)(x + DOORBELL_TID_OFFSET)) |
60 | #define DBELL_INF(x) (*(u16 *)(x + DOORBELL_INFO_OFFSET)) | 60 | #define DBELL_INF(x) (*(u16 *)(x + DOORBELL_INFO_OFFSET)) |
61 | 61 | ||
62 | #define is_power_of_2(x) (((x) & ((x) - 1)) == 0) | ||
63 | |||
64 | struct rio_atmu_regs { | 62 | struct rio_atmu_regs { |
65 | u32 rowtar; | 63 | u32 rowtar; |
66 | u32 pad1; | 64 | u32 pad1; |