[PATCH] ACPI patch 4/9

This is the config.in and makefile changes for the latest code. The most
(only) interesting thing probably is ACPI is no longer flagged experimental.

diff --git a/arch/i386/config.in b/arch/i386/config.in
index 23fef6395785b850f23e1996b119e250aa085831..da4d7c67840f3ef990fce13828266064504decb6 100644 (file)
--- a/arch/i386/config.in
+++ b/arch/i386/config.in
@@ -208,6 +208,8 @@ endmenu
 mainmenu_option next_comment
 comment 'General options'
 
+source drivers/acpi/Config.in
+
 # Visual Workstation support is utterly broken.
 # If you want to see it working mail an VW540 to hch@infradead.org 8)
 #bool 'SGI Visual Workstation support' CONFIG_VISWS
@@ -266,14 +268,6 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
 bool 'Power Management support' CONFIG_PM
 
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
-   
-   if [ "$CONFIG_ACPI" != "n" ]; then
-      source drivers/acpi/Config.in
-   fi
-fi
-
 dep_tristate '  Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM
 if [ "$CONFIG_APM" != "n" ]; then
    bool '    Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 7f3bf5d80e518b99cdc65298237eb0cfbb11e92d..47fda4a75ed18d1e271dfa942374536fff9d46a4 100644 (file)
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -36,9 +36,11 @@ obj-$(CONFIG_X86_MSR)                += msr.o
 obj-$(CONFIG_X86_CPUID)                += cpuid.o
 obj-$(CONFIG_MICROCODE)                += microcode.o
 obj-$(CONFIG_APM)              += apm.o
+obj-$(CONFIG_ACPI)             += acpi.o
+obj-$(CONFIG_ACPI_SLEEP)       += acpi_wakeup.o
 obj-$(CONFIG_SMP)              += smp.o smpboot.o trampoline.o
 obj-$(CONFIG_X86_LOCAL_APIC)   += mpparse.o apic.o nmi.o
-obj-$(CONFIG_X86_IO_APIC)      += io_apic.o acpitable.o
+obj-$(CONFIG_X86_IO_APIC)      += io_apic.o
 ifdef CONFIG_VISWS
 obj-y += setup-visws.o
 obj-$(CONFIG_X86_VISWS_APIC)   += visws_apic.o

diff --git a/drivers/acpi/Config.in b/drivers/acpi/Config.in
index 74d3670f91b737094e8c1bea728950e0c934932b..89060081c3a4e9626d4a5ff795eb4b7e13d2fbb9 100644 (file)
--- a/drivers/acpi/Config.in
+++ b/drivers/acpi/Config.in
@@ -1,17 +1,47 @@
 #
-# ACPI configuration
+# ACPI Configuration
 #
-#mainmenu_option next_comment
-#comment 'ACPI Configuration'
+if [ "$CONFIG_X86" = "y" ]; then
+  mainmenu_option next_comment
+  comment 'ACPI Support'
+  dep_bool       'ACPI Support'        CONFIG_ACPI $CONFIG_PCI
+  if [ "$CONFIG_ACPI" = "y" ]; then
+    define_bool CONFIG_ACPI_BOOT       y
+    define_bool CONFIG_ACPI_BUS        y
+    define_bool CONFIG_ACPI_EC         y
+    define_bool CONFIG_ACPI_INTERPRETER y
+    define_bool CONFIG_ACPI_PCI        y
+    define_bool CONFIG_ACPI_POWER      y
+    define_bool CONFIG_ACPI_SLEEP      y
+    define_bool CONFIG_ACPI_SYSTEM     y
+    tristate     '  AC Adapter'        CONFIG_ACPI_AC          
+    tristate     '  Battery'           CONFIG_ACPI_BATTERY     
+    tristate     '  Button'            CONFIG_ACPI_BUTTON
+    tristate     '  Fan'               CONFIG_ACPI_FAN
+    tristate     '  Processor'         CONFIG_ACPI_PROCESSOR
+    dep_tristate '  Thermal Zone' CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
+    bool         '  Debug Statements'  CONFIG_ACPI_DEBUG
+  fi
+  endmenu
+fi
 
-dep_bool     '    ACPI Debug Statements' CONFIG_ACPI_DEBUG $CONFIG_ACPI
-dep_tristate '    ACPI Bus Manager' CONFIG_ACPI_BUSMGR $CONFIG_ACPI
-
-dep_tristate '      System' CONFIG_ACPI_SYS $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
-dep_tristate '      Processor' CONFIG_ACPI_CPU $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
-dep_tristate '      Button' CONFIG_ACPI_BUTTON $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
-dep_tristate '      AC Adapter' CONFIG_ACPI_AC $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
-dep_tristate '      Embedded Controller' CONFIG_ACPI_EC $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
-dep_tristate '      Control Method Battery' CONFIG_ACPI_CMBATT $CONFIG_ACPI_BUSMGR $CONFIG_ACPI $CONFIG_ACPI_EC
-dep_tristate '      Thermal' CONFIG_ACPI_THERMAL $CONFIG_ACPI_BUSMGR $CONFIG_ACPI  $CONFIG_ACPI_EC
-#endmenu
+if [ "$CONFIG_IA64" = "y" ]; then
+  if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
+    mainmenu_option next_comment
+    comment 'ACPI Support'
+    define_bool CONFIG_ACPI            y
+    define_bool CONFIG_ACPI_EFI                y
+    define_bool CONFIG_ACPI_BOOT       y
+    define_bool CONFIG_ACPI_BUS                y
+    define_bool CONFIG_ACPI_INTERPRETER y
+    define_bool CONFIG_ACPI_PCI                y
+    define_bool CONFIG_ACPI_POWER      y
+    define_bool CONFIG_ACPI_SYSTEM     y
+    tristate     '  Button'            CONFIG_ACPI_BUTTON
+    tristate     '  Fan'               CONFIG_ACPI_FAN
+    tristate     '  Processor'         CONFIG_ACPI_PROCESSOR
+    dep_tristate '  Thermal Zone' CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
+    bool         '  Debug Statements'  CONFIG_ACPI_DEBUG
+    endmenu
+  fi
+fi

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index c4be885df9f33686ea2ff03109b0812b604cccff..27dcb65d6d6f40f3af12e93c05840938fd4e8c95 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -4,51 +4,52 @@
 
 O_TARGET := acpi.o
 
-export-objs := acpi_ksyms.o
-
 export ACPI_CFLAGS
 
-ACPI_CFLAGS := -D_LINUX -I$(CURDIR)/include
-
-#
-# CONFIG_ACPI_KERNEL_CONFIG is currently only IA64
-#
-ifdef CONFIG_ACPI_KERNEL_CONFIG
-  ACPI_CFLAGS += -DCONFIG_ACPI_KERNEL_CONFIG_ONLY
-endif
-
-acpi-subdirs := utilities dispatcher events hardware \
-               executer namespace parser resources tables
+ACPI_CFLAGS    := -D_LINUX -I$(CURDIR)/include
 
 ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS += -DACPI_DEBUG -Wno-unused
-endif
-
-ifdef CONFIG_ACPI_DEBUGGER
-  ACPI_CFLAGS += -DENABLE_DEBUGGER
-  acpi-subdirs += debugger
+  ACPI_CFLAGS  += -DACPI_DEBUG -Wno-unused
 endif
 
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
+EXTRA_CFLAGS   += $(ACPI_CFLAGS)
 
-mod-subdirs  := ospm
+export-objs    := acpi_ksyms.o
 
-subdir-$(CONFIG_ACPI)          += $(acpi-subdirs)
-subdir-$(CONFIG_ACPI_BUSMGR)   += ospm
+obj-y          := acpi_ksyms.o 
 
-obj-$(CONFIG_ACPI)     += driver.o os.o acpi_ksyms.o
-obj-$(CONFIG_ACPI)     += $(foreach dir,$(acpi-subdirs),$(dir)/$(dir).o) 
-ifdef CONFIG_ACPI_KERNEL_CONFIG
-   obj-$(CONFIG_ACPI)  += acpiconf.o osconf.o
+#
+# ACPI Boot-Time Table Parsing
+#
+ifeq ($(CONFIG_ACPI_BOOT),y)
+  obj-y                += acpi_tables.o
 endif
 
-ifeq ($(CONFIG_ACPI_BUSMGR),y)
-       obj-y                   += ospm/ospm.o
+#
+# ACPI Core Subsystem (Interpreter)
+#
+ifeq ($(CONFIG_ACPI_INTERPRETER),y)
+  obj-y                += acpi_osl.o acpi_utils.o
+  subdir-y     += dispatcher events executer hardware namespace parser \
+                  resources tables utilities
+  obj-y        += $(foreach dir,$(subdir-y),$(dir)/$(dir).o)
 endif
 
-# commented out until we distribute it -ASG
-#ifeq ($(CONFIG_KDB),y)
-#      obj-m   += kdb/kdbm_acpi.o
-#endif
+#
+# ACPI Bus and Device Drivers
+#
+ifeq ($(CONFIG_ACPI_BUS),y)
+  obj-y                                += acpi_bus.o 
+  obj-$(CONFIG_ACPI_AC)        += acpi_ac.o
+  obj-$(CONFIG_ACPI_BATTERY)   += acpi_battery.o
+  obj-$(CONFIG_ACPI_BUTTON)    += acpi_button.o
+  obj-$(CONFIG_ACPI_EC)                += acpi_ec.o
+  obj-$(CONFIG_ACPI_FAN)       += acpi_fan.o
+  obj-$(CONFIG_ACPI_PCI)       += acpi_pci_root.o acpi_pci_link.o
+  obj-$(CONFIG_ACPI_POWER)     += acpi_power.o
+  obj-$(CONFIG_ACPI_PROCESSOR) += acpi_processor.o
+  obj-$(CONFIG_ACPI_THERMAL)   += acpi_thermal.o
+  obj-$(CONFIG_ACPI_SYSTEM)    += acpi_system.o
+endif
 
 include $(TOPDIR)/Rules.make