vserver 1.9.5.x5

[linux-2.6.git] / arch / ia64 / mm / tlb.c

diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index dc15aa0..bd62f55 100644 (file)
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -88,7 +88,7 @@ wrap_mmu_context (struct mm_struct *mm)
 void
 ia64_global_tlb_purge (unsigned long start, unsigned long end, unsigned long nbits)
 {
-       static spinlock_t ptcg_lock = SPIN_LOCK_UNLOCKED;
+       static DEFINE_SPINLOCK(ptcg_lock);
 
        /* HW requires global serialization of ptc.ga.  */
        spin_lock(&ptcg_lock);
@@ -176,7 +176,7 @@ ia64_tlb_init (void)
        if ((status = ia64_pal_vm_page_size(&tr_pgbits, &purge.mask)) != 0) {
                printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld;"
                       "defaulting to architected purge page-sizes.\n", status);
-               purge.mask = 0x115557000;
+               purge.mask = 0x115557000UL;
        }
        purge.max_bits = ia64_fls(purge.mask);