Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / arch / s390 / kernel / setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 4553451..f5434d1 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -436,9 +436,15 @@ static struct resource data_resource = {
        .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
 };
 
+static struct resource bss_resource = {
+       .name = "Kernel bss",
+       .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
+};
+
 static struct resource __initdata *standard_resources[] = {
        &code_resource,
        &data_resource,
+       &bss_resource,
 };
 
 static void __init setup_resources(void)
@@ -450,6 +456,8 @@ static void __init setup_resources(void)
        code_resource.end = (unsigned long) &_etext - 1;
        data_resource.start = (unsigned long) &_etext;
        data_resource.end = (unsigned long) &_edata - 1;
+       bss_resource.start = (unsigned long) &__bss_start;
+       bss_resource.end = (unsigned long) &__bss_stop - 1;
 
        for (i = 0; i < MEMORY_CHUNKS; i++) {
                if (!memory_chunk[i].size)
@@ -700,7 +708,7 @@ static void __init setup_hwcaps(void)
         * and 1ULL<<0 as bit 63. Bits 0-31 contain the same information
         * as stored by stfl, bits 32-xxx contain additional facilities.
         * How many facility words are stored depends on the number of
-        * doublewords passed to the instruction. The additional facilites
+        * doublewords passed to the instruction. The additional facilities
         * are:
         *   Bit 42: decimal floating point facility is installed
         *   Bit 44: perform floating point operation facility is installed