From 198fd5d792eed7911f2ad4fb836524143d2d0bf7 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 18 Sep 2003 06:14:20 -0700 Subject: [PATCH] [ACPI] acpi_disabled is used after __initdata is freed. fixes random battery module loading problem -- SuSE bug #30477 (Andi Kleen) --- arch/i386/kernel/setup.c | 4 ++-- arch/x86_64/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 0015c3f96421a..e095207d893e6 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -65,9 +65,9 @@ unsigned long mmu_cr4_features; EXPORT_SYMBOL_GPL(mmu_cr4_features); #ifdef CONFIG_ACPI_INTERPRETER - int acpi_disabled __initdata = 0; + int acpi_disabled = 0; #else - int acpi_disabled __initdata = 1; + int acpi_disabled = 1; #endif EXPORT_SYMBOL(acpi_disabled); diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index c1c532fc56118..e09477fce9b04 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -64,7 +64,7 @@ struct cpuinfo_x86 boot_cpu_data; unsigned long mmu_cr4_features; EXPORT_SYMBOL_GPL(mmu_cr4_features); -int acpi_disabled __initdata = 0; +int acpi_disabled = 0; /* For PCI or other memory-mapped resources */ unsigned long pci_mem_start = 0x10000000; -- 2.53.0