Merge branch 'fix/soundcore' into for-linus

[pandora-kernel.git] / arch / ia64 / mm / tlb.c

diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index b9f3d7b..f426dc7 100644 (file)
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -34,7 +34,7 @@
 #include <asm/tlb.h>
 
 static struct {
-       unsigned long mask;     /* mask of supported purge page-sizes */
+       u64 mask;               /* mask of supported purge page-sizes */
        unsigned long max_bits; /* log2 of largest supported purge page-size */
 } purge;
 
@@ -328,7 +328,7 @@ void __devinit
 ia64_tlb_init (void)
 {
        ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */
-       unsigned long tr_pgbits;
+       u64 tr_pgbits;
        long status;
        pal_vm_info_1_u_t vm_info_1;
        pal_vm_info_2_u_t vm_info_2;