Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8dabba5d1a8f1893bc3db9bf66007de2020c8b62
Commit:     8dabba5d1a8f1893bc3db9bf66007de2020c8b62
Parent:     d003e7a1a569501cbe9a5ca14748177498c4893a
Author:     Kumar Gala <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 9 09:30:05 2007 -0600
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Fri Feb 9 09:30:05 2007 -0600

    [POWERPC] Fix is_power_of_4(x) compile error
    
    When building an 85xx kernel we get:
    
      CC      arch/powerpc/mm/pgtable_32.o
    arch/powerpc/mm/pgtable_32.c: In function 'io_block_mapping':
    arch/powerpc/mm/pgtable_32.c:330: error: expected identifier before '(' 
token
    arch/powerpc/mm/pgtable_32.c:330: error: expected statement before ')' token
    
    The is_power_of_2(x) fixup patch left an extra ')' on the is_power_of_4 
macro.
    There is a similiar issue on the arch/ppc side.
    
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
 arch/powerpc/mm/pgtable_32.c |    2 +-
 arch/ppc/mm/pgtable.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index bd02272..c284bda 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -295,7 +295,7 @@ void __init mapin_ram(void)
 }
 
 /* is x a power of 4? */
-#define is_power_of_4(x)       is_power_of_2(x) && (ffs(x) & 1))
+#define is_power_of_4(x)       is_power_of_2(x) && (ffs(x) & 1)
 
 /*
  * Set up a mapping for a block of I/O.
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 82b06a1..c023b72 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -314,7 +314,7 @@ void __init mapin_ram(void)
 }
 
 /* is x a power of 4? */
-#define is_power_of_4(x)       is_power_of_2(x) && (ffs(x) & 1))
+#define is_power_of_4(x)       is_power_of_2(x) && (ffs(x) & 1)
 
 /*
  * Set up a mapping for a block of I/O.
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to