Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / s390 / kernel / setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index e3d9325f6022b04e3bf307bdc3549362231c75ea..2aa13e8e000acdc26b23ddbdf84ba742fd0c853d 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -101,7 +101,7 @@ void __devinit cpu_init (void)
         /*
          * Store processor id in lowcore (used e.g. in timer_interrupt)
          */
-        asm volatile ("stidp %0": "=m" (S390_lowcore.cpu_data.cpu_id));
+       asm volatile("stidp %0": "=m" (S390_lowcore.cpu_data.cpu_id));
         S390_lowcore.cpu_data.cpu_addr = addr;
 
         /*
@@ -450,7 +450,7 @@ setup_lowcore(void)
                lc->extended_save_area_addr = (__u32)
                        __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0);
                /* enable extended save area */
-               ctl_set_bit(14, 29);
+               __ctl_set_bit(14, 29);
        }
 #endif
        set_prefix((u32)(unsigned long) lc);
@@ -543,7 +543,7 @@ setup_memory(void)
 #endif
 
        /*
-        * Initialize the boot-time allocator (with low memory only):
+        * Initialize the boot-time allocator
         */
        bootmap_size = init_bootmem(start_pfn, end_pfn);