From 3145c27ec37167ca4cd06653d89b6ce10577dc63 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 22 Jul 2010 17:23:10 -0400 Subject: [PATCH] --- yaml --- r: 201209 b: refs/heads/master c: d3e7e99f2faf9f44ec0a3379f735b41c9173dfa1 h: refs/heads/master i: 201207: ceeaf25b574b99229857661cf6c3727b467cb032 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_idle.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fc8168ea3da5..7bc9a3a21b83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 718be4aaf3613cf7c2d097f925abc3d3553c0605 +refs/heads/master: d3e7e99f2faf9f44ec0a3379f735b41c9173dfa1 diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c index b351342f1faf..1d4104855296 100644 --- a/trunk/drivers/acpi/processor_idle.c +++ b/trunk/drivers/acpi/processor_idle.c @@ -76,6 +76,8 @@ static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER; module_param(max_cstate, uint, 0000); static unsigned int nocst __read_mostly; module_param(nocst, uint, 0000); +static int bm_check_disable __read_mostly; +module_param(bm_check_disable, uint, 0000); static unsigned int latency_factor __read_mostly = 2; module_param(latency_factor, uint, 0644); @@ -763,6 +765,9 @@ static int acpi_idle_bm_check(void) { u32 bm_status = 0; + if (bm_check_disable) + return 0; + acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status); if (bm_status) acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);