Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core

2008-12-25 11:50:41 +01:00
parent bed4f13065 c1c15b65ec 1fcccb008b 4a6908a3a0
commit 79a66b96c3
39 changed files with 126 additions and 102 deletions
@@ -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)

@@ -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__ */