patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ia64 / kernel / setup.c

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 993d096..aa2cb4f 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -330,18 +330,8 @@ setup_arch (char **cmdline_p)
                setup_serial_hcdp(efi.hcdp);
        }
 #endif
-       /*
-        * Without HCDP, we won't discover any serial ports until the serial driver looks
-        * in the ACPI namespace.  If ACPI claims there are some legacy devices, register
-        * the legacy COM ports so serial console works earlier.  This is slightly dangerous
-        * because we don't *really* know whether there's anything there, but we hope that
-        * all new boxes will implement HCDP.
-        */
-       {
-               extern unsigned char acpi_legacy_devices;
-               if (!efi.hcdp && acpi_legacy_devices)
-                       setup_serial_legacy();
-       }
+       if (!efi.hcdp)
+               setup_serial_legacy();
 #endif
 
 #ifdef CONFIG_VT
@@ -575,7 +565,7 @@ get_max_cacheline_size (void)
 void
 cpu_init (void)
 {
-       extern void __init ia64_mmu_init (void *);
+       extern void __devinit ia64_mmu_init (void *);
        unsigned long num_phys_stacked;
        pal_vm_info_2_u_t vmi;
        unsigned int max_ctx;
@@ -635,6 +625,9 @@ cpu_init (void)
        ia32_cpu_init();
 #endif
 
+       /* Clear ITC to eliminiate sched_clock() overflows in human time.  */
+       ia64_set_itc(0);
+
        /* disable all local interrupt sources: */
        ia64_set_itv(1 << 16);
        ia64_set_lrr0(1 << 16);