Merge http://lia64.bkbits.net/to-linus-2.5

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc arch/ia64/kernel/fsys.S
Simple merge

diff --cc arch/ia64/kernel/head.S
Simple merge

diff --cc arch/ia64/kernel/process.c
Simple merge

diff --cc arch/ia64/kernel/smp.c
Simple merge

diff --cc arch/ia64/kernel/smpboot.c
index 852545d6fb7ba2bd7f5b5c8f738f08d27d78115a,2a0ae0eedc351de75164cb4c7abde3dd18673aca..8058fb5881f508ab900bd40f2252569d8ab5b787
--- 1/arch/ia64/kernel/smpboot.c
--- 2/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@@ -296,22 -284,8 +294,12 @@@ smp_callin (void
                BUG();
        }
  
 +      lock_ipi_calllock();
 +      cpu_set(cpuid, cpu_online_map);
 +      unlock_ipi_calllock();
 +
        smp_setup_percpu_timer();
  
-       /*
-        * Get our bogomips.
-        */
-       ia64_init_itm();
- 
-       /*
-        * Set I/O port base per CPU
-        */
-       ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase));
- 
        ia64_mca_cmc_vector_setup();    /* Setup vector on AP & enable */
  
  #ifdef CONFIG_PERFMON

diff --cc arch/ia64/mm/init.c
Simple merge