Merge branch 'acpi-config'

* acpi-config: ACPI: Remove Kconfig symbol ACPI_PROCFS ACPI / APEI: Remove X86 redundant dependency for APEI GHES. ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY

Merge branch 'acpi-config'
* acpi-config: ACPI: Remove Kconfig symbol ACPI_PROCFS ACPI / APEI: Remove X86 redundant dependency for APEI GHES. ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY
Rafael J. Wysocki
2 parents 6621c5a69a 7919010c42
Showing 8 changed files Side-by-side Diff
arch/ia64/configs/generic_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/zx1_defconfig
arch/x86/configs/i386_defconfig
arch/x86/configs/x86_64_defconfig
drivers/acpi/Kconfig
drivers/acpi/apei/Kconfig
include/acpi/platform/aclinux.h
@@ -25,7 +25,6 @@
 CONFIG_CRASH_DUMP=y
 CONFIG_EFI_VARS=y
 CONFIG_BINFMT_MISC=m
-CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
@@ -26,7 +26,6 @@
 CONFIG_KEXEC=y
 CONFIG_EFI_VARS=y
 CONFIG_BINFMT_MISC=m
-CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_PROCESSOR=m
@@ -16,7 +16,6 @@
 CONFIG_CRASH_DUMP=y
 CONFIG_EFI_VARS=y
 CONFIG_BINFMT_MISC=y
-CONFIG_ACPI_PROCFS=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_PACKET=y
@@ -60,7 +60,6 @@
 CONFIG_HIBERNATION=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE_RTC=y
-CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_DOCK=y
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
@@ -58,7 +58,6 @@
 CONFIG_HIBERNATION=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE_RTC=y
-CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_DOCK=y
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
@@ -43,19 +43,6 @@
 	depends on SUSPEND || HIBERNATION
 	default y
  
-config ACPI_PROCFS
-	bool "Deprecated /proc/acpi files"
-	depends on PROC_FS
-	help
-	  For backwards compatibility, this option allows
-	  deprecated /proc/acpi/ files to exist, even when
-	  they have been replaced by functions in /sys.
-
-	  This option has no effect on /proc/acpi/ files
-	  and functions which do not yet exist in /sys.
-
-	  Say N to delete /proc/acpi/ files that have moved to /sys/
-
 config ACPI_EC_DEBUGFS
 	tristate "EC read/write access through /sys/kernel/debug/ec"
 	default n
@@ -342,6 +329,19 @@
 	  Resource Table, which allows the operating system to obtain
 	  data from the firmware boot splash. It will appear under
 	  /sys/firmware/acpi/bgrt/ .
+
+config ACPI_REDUCED_HARDWARE_ONLY
+	bool "Hardware-reduced ACPI support only" if EXPERT
+	def_bool n
+	depends on ACPI
+	help
+	This config item changes the way the ACPI code is built.  When this
+	option is selected, the kernel will use a specialized version of
+	ACPICA that ONLY supports the ACPI "reduced hardware" mode.  The
+	resulting kernel will be smaller but it will also be restricted to
+	running in ACPI reduced hardware mode ONLY.
+
+	If you are unsure what to do, do not enable this option.
  
 source "drivers/acpi/apei/Kconfig"
  
@@ -12,7 +12,7 @@
  
 config ACPI_APEI_GHES
 	bool "APEI Generic Hardware Error Source"
-	depends on ACPI_APEI && X86
+	depends on ACPI_APEI
 	select ACPI_HED
 	select IRQ_WORK
 	select GENERIC_ALLOCATOR
@@ -52,6 +52,12 @@
  
 #ifdef __KERNEL__
  
+/* Compile for reduced hardware mode only with this kernel config */
+
+#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
+#define ACPI_REDUCED_HARDWARE 1
+#endif
+
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/ctype.h>
...	...	@@ -25,7 +25,6 @@
25	25	CONFIG_CRASH_DUMP=y
26	26	CONFIG_EFI_VARS=y
27	27	CONFIG_BINFMT_MISC=m
28		-CONFIG_ACPI_PROCFS=y
29	28	CONFIG_ACPI_BUTTON=m
30	29	CONFIG_ACPI_FAN=m
31	30	CONFIG_ACPI_DOCK=y
...	...	@@ -26,7 +26,6 @@
26	26	CONFIG_KEXEC=y
27	27	CONFIG_EFI_VARS=y
28	28	CONFIG_BINFMT_MISC=m
29		-CONFIG_ACPI_PROCFS=y
30	29	CONFIG_ACPI_BUTTON=m
31	30	CONFIG_ACPI_FAN=m
32	31	CONFIG_ACPI_PROCESSOR=m
...	...	@@ -16,7 +16,6 @@
16	16	CONFIG_CRASH_DUMP=y
17	17	CONFIG_EFI_VARS=y
18	18	CONFIG_BINFMT_MISC=y
19		-CONFIG_ACPI_PROCFS=y
20	19	CONFIG_HOTPLUG_PCI=y
21	20	CONFIG_HOTPLUG_PCI_ACPI=y
22	21	CONFIG_PACKET=y
...	...	@@ -60,7 +60,6 @@
60	60	CONFIG_HIBERNATION=y
61	61	CONFIG_PM_DEBUG=y
62	62	CONFIG_PM_TRACE_RTC=y
63		-CONFIG_ACPI_PROCFS=y
64	63	CONFIG_ACPI_DOCK=y
65	64	CONFIG_CPU_FREQ=y
66	65	# CONFIG_CPU_FREQ_STAT is not set
...	...	@@ -58,7 +58,6 @@
58	58	CONFIG_HIBERNATION=y
59	59	CONFIG_PM_DEBUG=y
60	60	CONFIG_PM_TRACE_RTC=y
61		-CONFIG_ACPI_PROCFS=y
62	61	CONFIG_ACPI_DOCK=y
63	62	CONFIG_CPU_FREQ=y
64	63	# CONFIG_CPU_FREQ_STAT is not set
...	...	@@ -43,19 +43,6 @@
43	43	depends on SUSPEND \|\| HIBERNATION
44	44	default y
45	45
46		-config ACPI_PROCFS
47		- bool "Deprecated /proc/acpi files"
48		- depends on PROC_FS
49		- help
50		- For backwards compatibility, this option allows
51		- deprecated /proc/acpi/ files to exist, even when
52		- they have been replaced by functions in /sys.
53		-
54		- This option has no effect on /proc/acpi/ files
55		- and functions which do not yet exist in /sys.
56		-
57		- Say N to delete /proc/acpi/ files that have moved to /sys/
58		-
59	46	config ACPI_EC_DEBUGFS
60	47	tristate "EC read/write access through /sys/kernel/debug/ec"
61	48	default n
...	...	@@ -342,6 +329,19 @@
342	329	Resource Table, which allows the operating system to obtain
343	330	data from the firmware boot splash. It will appear under
344	331	/sys/firmware/acpi/bgrt/ .
	332	+
	333	+config ACPI_REDUCED_HARDWARE_ONLY
	334	+ bool "Hardware-reduced ACPI support only" if EXPERT
	335	+ def_bool n
	336	+ depends on ACPI
	337	+ help
	338	+ This config item changes the way the ACPI code is built. When this
	339	+ option is selected, the kernel will use a specialized version of
	340	+ ACPICA that ONLY supports the ACPI "reduced hardware" mode. The
	341	+ resulting kernel will be smaller but it will also be restricted to
	342	+ running in ACPI reduced hardware mode ONLY.
	343	+
	344	+ If you are unsure what to do, do not enable this option.
345	345
346	346	source "drivers/acpi/apei/Kconfig"
347	347
...	...	@@ -12,7 +12,7 @@
12	12
13	13	config ACPI_APEI_GHES
14	14	bool "APEI Generic Hardware Error Source"
15		- depends on ACPI_APEI && X86
	15	+ depends on ACPI_APEI
16	16	select ACPI_HED
17	17	select IRQ_WORK
18	18	select GENERIC_ALLOCATOR
...	...	@@ -52,6 +52,12 @@
52	52
53	53	#ifdef __KERNEL__
54	54
	55	+/* Compile for reduced hardware mode only with this kernel config */
	56	+
	57	+#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
	58	+#define ACPI_REDUCED_HARDWARE 1
	59	+#endif
	60	+
55	61	#include <linux/string.h>
56	62	#include <linux/kernel.h>
57	63	#include <linux/ctype.h>