---

yaml --- r: 118798 b: refs/heads/master c: 87b5860 h: refs/heads/master v: v3
git-mirror · Nov 8, 2008 · 8b0839b · 8b0839b
1 parent 3e6e370
commit 8b0839b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd7279919f682da8752fb47784a1ee302f8b7ea
+refs/heads/master: 87b586088ef953c602680e5aff8ab83a2e299498
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
@@ -688,6 +688,14 @@ 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 */