Commit c47a75a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0099f77e abe1dfab

Documentation/kernel-parameters.txt

+7 −4
Original line number Diff line number Diff line
@@ -220,14 +220,17 @@ and is between 256 and 4096 characters. It is defined in the file 
			Bits in debug_level correspond to a level in

			ACPI_DEBUG_PRINT statements, e.g.,

			    ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...

			See Documentation/acpi/debug.txt for more information

			about debug layers and levels.

			The debug_level mask defaults to "info".  See

			Documentation/acpi/debug.txt for more information about

			debug layers and levels.



			Enable processor driver info messages:

			    acpi.debug_layer=0x20000000

			Enable PCI/PCI interrupt routing info messages:

			    acpi.debug_layer=0x400000

			Enable AML "Debug" output, i.e., stores to the Debug

			object while interpreting AML:

			    acpi.debug_layer=0xffffffff acpi.debug_level=0x2

			Enable PCI/PCI interrupt routing info messages:

			    acpi.debug_layer=0x400000 acpi.debug_level=0x4

			Enable all messages related to ACPI hardware:

			    acpi.debug_layer=0x2 acpi.debug_level=0xffffffff

drivers/acpi/bus.c

+0 −8
Original line number Diff line number Diff line
@@ -688,14 +688,6 @@ void __init acpi_early_init(void) 
	if (acpi_disabled)

		return;



	/*

	 * ACPI CA initializes acpi_dbg_level to non-zero, which means

	 * we get debug output merely by turning on CONFIG_ACPI_DEBUG.

	 * Turn it off so we don't get output unless the user specifies

	 * acpi.debug_level.

	 */

	acpi_dbg_level = 0;



	printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);



	/* enable workarounds, unless strict ACPI spec. compliance */

drivers/acpi/utilities/utglobal.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT; 


/* Debug switch - layer (component) mask */



u32 acpi_dbg_layer = ACPI_COMPONENT_DEFAULT | ACPI_ALL_DRIVERS;

u32 acpi_dbg_layer = 0;

u32 acpi_gbl_nesting_level = 0;



/* Debugger globals */

include/acpi/acoutput.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 


/* Defaults for debug_level, debug and normal */



#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)

#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INFO)

#define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)

#define ACPI_DEBUG_ALL              (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)

include/acpi/platform/aclinux.h

+5 −1
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache) 
/*

 * We need to show where it is safe to preempt execution of ACPICA

 */

#define ACPI_PREEMPTION_POINT()	cond_resched()

#define ACPI_PREEMPTION_POINT()		\

	do {				\

		if (!irqs_disabled())	\

			cond_resched();	\

	} while (0)



#endif				/* __ACLINUX_H__ */