Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

diff --cc arch/ia64/config.in
Simple merge

diff --cc arch/ia64/kernel/efi.c
index 76711c38bfa1aadb9cae37faf215c628f621516e,b9b8149b829c9ed6378cc8bdac461218a3a4cbfc..cff8017b0a7f73d44eb7d0426e09f4545056de82
--- 1/arch/ia64/kernel/efi.c
--- 2/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@@ -266,10 -266,10 +266,10 @@@ efi_map_pal_code (void
                /*
                 * Cannot write to CRx with PSR.ic=1
                 */
-               ia64_clear_ic(flags);
+               psr = ia64_clear_ic();
                ia64_itr(0x1, IA64_TR_PALCODE, vaddr & mask,
 -                       pte_val(mk_pte_phys(md->phys_addr, PAGE_KERNEL)), IA64_GRANULE_SHIFT);
 +                       pte_val(pfn_pte(md->phys_addr >> PAGE_SHIFT, PAGE_KERNEL)), IA64_GRANULE_SHIFT);
-               local_irq_restore(flags);
+               ia64_set_psr(psr);
                ia64_srlz_i();
        }
  }

diff --cc arch/ia64/mm/init.c
index de8b287d756f7d732161ecba87d6d7bee266b78a,c35a818750181ea15cde0a83c39e7f59cd7e9ea7..4ffede8cc85bec12cb461ac89328fbd0d54a521a
--- 1/arch/ia64/mm/init.c
--- 2/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@@ -276,9 -289,9 +276,9 @@@ ia64_mmu_init (void *my_cpu_data
        ia64_srlz_d();
  
        ia64_itr(0x2, IA64_TR_PERCPU_DATA, PERCPU_ADDR,
 -               pte_val(mk_pte_phys(__pa(my_cpu_data), PAGE_KERNEL)), PAGE_SHIFT);
 +               pte_val(pfn_pte(__pa(my_cpu_data) >> PAGE_SHIFT, PAGE_KERNEL)), PAGE_SHIFT);
  
-       __restore_flags(flags);
+       ia64_set_psr(psr);
        ia64_srlz_i();
  
        /*

diff --cc arch/ia64/sn/kernel/misctest.c
index d68b2a3b742592c60bb656c6758b629a9fc3040f,2a2b5ca1798f7c924c638007b15ecc7052739856..1c8ced1310ef5a2193850352b5c1929d114465eb
--- 1/arch/ia64/sn/kernel/misctest.c
--- 2/arch/ia64/sn/kernel/misctest.c
+++ b/arch/ia64/sn/kernel/misctest.c
@@@ -87,11 -87,11 +87,11 @@@ sgi_mcatest(void
                        ia64_set_dcr(dcr);
                        res = ia64_sn_probe_io_slot(0xff00000000UL, 8, &val);
                        printk("zzzspec: probe %ld, 0x%lx\n", res, val);
-                       ia64_clear_ic(flags);
+                       psr = ia64_clear_ic();
                        ia64_itc(0x2, 0xe00000ff00000000UL,
 -                                pte_val(mk_pte_phys(0xff00000000UL,
 +                                pte_val(pfn_pte(0xff00000000UL >> PAGE_SHIFT,
                                  __pgprot(__DIRTY_BITS|_PAGE_PL_0|_PAGE_AR_RW))), _PAGE_SIZE_256M);
-                       local_irq_restore(flags);
+                       ia64_set_psr(psr);
                        ia64_srlz_i ();
                }
  

diff --cc arch/ia64/vmlinux.lds.S
Simple merge