The patch titled
Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT
has been added to the -mm tree. Its filename is
replace-arch_has_power_init-with-config_acpi_power_init.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT. Move it from header
files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/acpi/Kconfig | 4 ++++
include/acpi/processor.h | 2 +-
include/asm-i386/acpi.h | 2 --
include/asm-x86_64/acpi.h | 2 --
4 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/acpi/Kconfig~replace-arch_has_power_init-with-config_acpi_power_init drivers/acpi/Kconfig
--- a/drivers/acpi/Kconfig~replace-arch_has_power_init-with-config_acpi_power_init
+++ a/drivers/acpi/Kconfig
@@ -320,6 +320,10 @@ config ACPI_POWER
bool
default y
+config ACPI_POWER_INIT
+ def_bool y
+ depends on X86
+
config ACPI_SYSTEM
bool
default y
diff -puN include/acpi/processor.h~replace-arch_has_power_init-with-config_acpi_power_init include/acpi/processor.h
--- a/include/acpi/processor.h~replace-arch_has_power_init-with-config_acpi_power_init
+++ a/include/acpi/processor.h
@@ -203,7 +203,7 @@ extern struct acpi_processor_errata erra
void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
-#ifdef ARCH_HAS_POWER_INIT
+#ifdef CONFIG_ACPI_POWER_INIT
void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
unsigned int cpu);
#else
diff -puN include/asm-i386/acpi.h~replace-arch_has_power_init-with-config_acpi_power_init include/asm-i386/acpi.h
--- a/include/asm-i386/acpi.h~replace-arch_has_power_init-with-config_acpi_power_init
+++ a/include/asm-i386/acpi.h
@@ -167,8 +167,6 @@ extern void acpi_reserve_bootmem(void);
extern u8 x86_acpiid_to_apicid[];
-#define ARCH_HAS_POWER_INIT 1
-
#endif /*__KERNEL__*/
#endif /*_ASM_ACPI_H*/
diff -puN include/asm-x86_64/acpi.h~replace-arch_has_power_init-with-config_acpi_power_init include/asm-x86_64/acpi.h
--- a/include/asm-x86_64/acpi.h~replace-arch_has_power_init-with-config_acpi_power_init
+++ a/include/asm-x86_64/acpi.h
@@ -162,8 +162,6 @@ extern int acpi_pci_disabled;
extern u8 x86_acpiid_to_apicid[];
-#define ARCH_HAS_POWER_INIT 1
-
extern int acpi_skip_timer_override;
#endif /*__KERNEL__*/
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
pcmcia-ds-must_check-fixes.patch
libsas-externs-not-needed.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
tiacx-sparse-cleanups.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-fixes-for-debugfs.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
replace-arch_has_sched_wake_idle-with-config_sched_smt.patch
replace-__arch_has_do_softirq-with.patch
replace-arch_has_read_current_timer-with.patch
replace-arch_has_nmi_watchdog-with.patch
replace-arch_has_flush_anon_page-with.patch
replace-arch_has_socket_types-with.patch
replace-arch_has_valid_phys_addr_range-with.patch
replace-__arch_has_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
