[PATCH][2.3.99-pre9] arch/i386/config.in PM xconfig bug

From: Matthias Andree (ma@dt.e-technik.uni-dortmund.de)
Date: Tue May 23 2000 - 19:27:36 EST

Hi,

in the General Setup Menu, if Power Management is N, xconfig offers the
suboptions of ACPI or APM. I identified the != "n" tests as problematic
(since CONFIG_APM/ACPI are undefined/empty) and wrapped the entire
section in a [ "$CONFIG_PM" != "n" ] to circumvent that problem.

It my perception of the problem is correct, so is my patch. Is there
any CodingStyle as to the indention depth for config.in? My patch uses
2 characters indent.

Patch follows:

--- arch/i386/config.in.orig Wed May 24 02:13:56 2000
+++ arch/i386/config.in Wed May 24 02:12:35 2000
@@ -167,25 +167,27 @@
 
 bool 'Power Management support' CONFIG_PM
 
-dep_tristate ' ACPI support' CONFIG_ACPI $CONFIG_PM
-if [ "$CONFIG_ACPI" != "n" ]; then
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- bool ' Enter S1 for sleep (EXPERIMENTAL)' CONFIG_ACPI_S1_SLEEP
- fi
+if [ "$CONFIG_PM" != "n" ]; then
+ dep_tristate ' ACPI support' CONFIG_ACPI $CONFIG_PM
+ if [ "$CONFIG_ACPI" != "n" ]; then
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool ' Enter S1 for sleep (EXPERIMENTAL)' CONFIG_ACPI_S1_SLEEP
+ 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
+ bool ' Enable PM at boot time' CONFIG_APM_DO_ENABLE
+ bool ' Make CPU Idle calls when idle' CONFIG_APM_CPU_IDLE
+ bool ' Enable console blanking using APM' CONFIG_APM_DISPLAY_BLANK
+ bool ' Ignore multiple suspend/resume cycles' CONFIG_APM_IGNORE_SUSPEND_BOUNCE
+ bool ' RTC stores time in GMT' CONFIG_APM_RTC_IS_GMT
+ bool ' Allow interrupts during APM BIOS calls' CONFIG_APM_ALLOW_INTS
+ bool ' Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF
+ 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
- bool ' Enable PM at boot time' CONFIG_APM_DO_ENABLE
- bool ' Make CPU Idle calls when idle' CONFIG_APM_CPU_IDLE
- bool ' Enable console blanking using APM' CONFIG_APM_DISPLAY_BLANK
- bool ' Ignore multiple suspend/resume cycles' CONFIG_APM_IGNORE_SUSPEND_BOUNCE
- bool ' RTC stores time in GMT' CONFIG_APM_RTC_IS_GMT
- bool ' Allow interrupts during APM BIOS calls' CONFIG_APM_ALLOW_INTS
- bool ' Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF
-fi
-
+
 endmenu
 
 source drivers/parport/Config.in 

-- 
Matthias Andree

                Where do you think you're going today?

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Wed May 31 2000 - 21:00:12 EST