Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: don't cond_resched() when irqs_disabled()
ACPI: fix 2.6.28 acpi.debug_level regression
+14
-15
+7
-4
Documentation/kernel-parameters.txt
+7
-4
Documentation/kernel-parameters.txt
···
220
220
Bits in debug_level correspond to a level in
221
221
ACPI_DEBUG_PRINT statements, e.g.,
222
222
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...
223
-
See Documentation/acpi/debug.txt for more information
224
-
about debug layers and levels.
223
+
The debug_level mask defaults to "info". See
224
+
Documentation/acpi/debug.txt for more information about
225
+
debug layers and levels.
225
226
227
+
Enable processor driver info messages:
228
+
acpi.debug_layer=0x20000000
229
+
Enable PCI/PCI interrupt routing info messages:
230
+
acpi.debug_layer=0x400000
226
231
Enable AML "Debug" output, i.e., stores to the Debug
227
232
object while interpreting AML:
228
233
acpi.debug_layer=0xffffffff acpi.debug_level=0x2
229
-
Enable PCI/PCI interrupt routing info messages:
230
-
acpi.debug_layer=0x400000 acpi.debug_level=0x4
231
234
Enable all messages related to ACPI hardware:
232
235
acpi.debug_layer=0x2 acpi.debug_level=0xffffffff
233
236
-8
drivers/acpi/bus.c
-8
drivers/acpi/bus.c
···
688
688
if (acpi_disabled)
689
689
return;
690
690
691
-
/*
692
-
* ACPI CA initializes acpi_dbg_level to non-zero, which means
693
-
* we get debug output merely by turning on CONFIG_ACPI_DEBUG.
694
-
* Turn it off so we don't get output unless the user specifies
695
-
* acpi.debug_level.
696
-
*/
697
-
acpi_dbg_level = 0;
698
-
699
691
printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);
700
692
701
693
/* enable workarounds, unless strict ACPI spec. compliance */
+1
-1
drivers/acpi/utilities/utglobal.c
+1
-1
drivers/acpi/utilities/utglobal.c
+1
-1
include/acpi/acoutput.h
+1
-1
include/acpi/acoutput.h
···
172
172
173
173
/* Defaults for debug_level, debug and normal */
174
174
175
-
#define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
175
+
#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO)
176
176
#define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
177
177
#define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
178
178
+5
-1
include/acpi/platform/aclinux.h
+5
-1
include/acpi/platform/aclinux.h
···
141
141
/*
142
142
* We need to show where it is safe to preempt execution of ACPICA
143
143
*/
144
-
#define ACPI_PREEMPTION_POINT() cond_resched()
144
+
#define ACPI_PREEMPTION_POINT() \
145
+
do { \
146
+
if (!irqs_disabled()) \
147
+
cond_resched(); \
148
+
} while (0)
145
149
146
150
#endif /* __ACLINUX_H__ */