From 4ff90e43c88b64fb26164841d2b0529d91925ef1 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 22 Nov 2007 14:28:31 +0000 Subject: [PATCH] linux/x86: don't build cstate.o and wakeup.o The code in arch/i386/kernel/acpi/cstate.c is (at best) irrelevant for VMs. The code in arch/{i386,x86_64}/kernel/acpi/wakeup.S is even dangerous; while not being actively used, its inadvertant use would go unnoticed. Signed-off-by: Jan Beulich --- arch/i386/kernel/acpi/Makefile | 1 + arch/i386/kernel/acpi/sleep-xen.c | 7 ++++++- arch/x86_64/kernel/acpi/Makefile | 3 +++ arch/x86_64/kernel/acpi/sleep-xen.c | 7 ++++++- include/asm-i386/acpi.h | 2 ++ include/asm-x86_64/acpi.h | 2 ++ kernel/sysctl.c | 2 +- 7 files changed, 21 insertions(+), 3 deletions(-) diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile index 7e9ac993..c48bcdcb 100644 --- a/arch/i386/kernel/acpi/Makefile +++ b/arch/i386/kernel/acpi/Makefile @@ -6,3 +6,4 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o endif +disabled-obj-$(CONFIG_XEN) := cstate.o wakeup.o diff --git a/arch/i386/kernel/acpi/sleep-xen.c b/arch/i386/kernel/acpi/sleep-xen.c index 488bfaf1..e1dec995 100644 --- a/arch/i386/kernel/acpi/sleep-xen.c +++ b/arch/i386/kernel/acpi/sleep-xen.c @@ -12,12 +12,14 @@ #include +#ifndef CONFIG_ACPI_PV_SLEEP /* address in low memory of the wakeup routine. */ unsigned long acpi_wakeup_address = 0; unsigned long acpi_video_flags; extern char wakeup_start, wakeup_end; extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long)); +#endif /** * acpi_save_state_mem - save kernel state @@ -54,6 +56,7 @@ void acpi_restore_state_mem(void) */ void __init acpi_reserve_bootmem(void) { +#ifndef CONFIG_ACPI_PV_SLEEP if ((&wakeup_end - &wakeup_start) > PAGE_SIZE) { printk(KERN_ERR "ACPI: Wakeup code way too big, S3 disabled.\n"); @@ -63,8 +66,10 @@ void __init acpi_reserve_bootmem(void) acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE); if (!acpi_wakeup_address) printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n"); +#endif } +#ifndef CONFIG_ACPI_PV_SLEEP static int __init acpi_sleep_setup(char *str) { while ((str != NULL) && (*str != '\0')) { @@ -106,7 +111,7 @@ static int __init acpisleep_dmi_init(void) core_initcall(acpisleep_dmi_init); -#ifdef CONFIG_ACPI_PV_SLEEP +#else /* CONFIG_ACPI_PV_SLEEP */ #include #include int acpi_notify_hypervisor_state(u8 sleep_state, diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 604e62bf..6ecd9d2b 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -5,4 +5,7 @@ obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += processor.o processor-y := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o +processor-$(CONFIG_XEN) := ../../../i386/kernel/acpi/processor.o endif + +disabled-obj-$(CONFIG_XEN) := wakeup.o diff --git a/arch/x86_64/kernel/acpi/sleep-xen.c b/arch/x86_64/kernel/acpi/sleep-xen.c index b073793f..c40baa4a 100644 --- a/arch/x86_64/kernel/acpi/sleep-xen.c +++ b/arch/x86_64/kernel/acpi/sleep-xen.c @@ -53,6 +53,7 @@ #ifdef CONFIG_ACPI_SLEEP +#ifndef CONFIG_ACPI_PV_SLEEP /* address in low memory of the wakeup routine. */ unsigned long acpi_wakeup_address = 0; unsigned long acpi_video_flags; @@ -70,6 +71,7 @@ static void init_low_mapping(void) WARN_ON(num_online_cpus() != 1); local_flush_tlb(); } +#endif /** * acpi_save_state_mem - save kernel state @@ -110,12 +112,15 @@ void acpi_restore_state_mem(void) */ void __init acpi_reserve_bootmem(void) { +#ifndef CONFIG_ACPI_PV_SLEEP acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE); if ((&wakeup_end - &wakeup_start) > PAGE_SIZE) printk(KERN_CRIT "ACPI: Wakeup code way too big, will crash on attempt to suspend\n"); +#endif } +#ifndef CONFIG_ACPI_PV_SLEEP static int __init acpi_sleep_setup(char *str) { while ((str != NULL) && (*str != '\0')) { @@ -133,7 +138,7 @@ static int __init acpi_sleep_setup(char *str) __setup("acpi_sleep=", acpi_sleep_setup); -#ifdef CONFIG_ACPI_PV_SLEEP +#else /* CONFIG_ACPI_PV_SLEEP */ #include #include int acpi_notify_hypervisor_state(u8 sleep_state, diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 8c855284..f2f10cc3 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -185,7 +185,9 @@ extern int acpi_notify_hypervisor_state(u8 sleep_state, extern u8 x86_acpiid_to_apicid[]; +#ifndef CONFIG_XEN #define ARCH_HAS_POWER_INIT 1 +#endif #endif /*__KERNEL__*/ diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h index d1a1faf5..69099781 100644 --- a/include/asm-x86_64/acpi.h +++ b/include/asm-x86_64/acpi.h @@ -166,7 +166,9 @@ extern int acpi_pci_disabled; extern u8 x86_acpiid_to_apicid[]; +#ifndef CONFIG_XEN #define ARCH_HAS_POWER_INIT 1 +#endif extern int acpi_skip_timer_override; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index fd43c3e6..27dc4b1c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -661,7 +661,7 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, #endif -#ifdef CONFIG_ACPI_SLEEP +#if defined(CONFIG_ACPI_SLEEP) && !defined(CONFIG_ACPI_PV_SLEEP) { .ctl_name = KERN_ACPI_VIDEO_FLAGS, .procname = "acpi_video_flags", -- 2.39.5