From: Len Brown <len.brown@intel.com>
Date: Fri, 3 Aug 2012 04:31:23 +0000 (-0400)
Subject: Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie... 
X-Git-Tag: v3.6-rc2~31^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9d0b01a1bbb7a4ad23000240b67bca33c4235fcf;p=linux-2.6-block.git

Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base
---

9d0b01a1bbb7a4ad23000240b67bca33c4235fcf
diff --cc drivers/acpi/sleep.c
index bd35e3c5e530,dca8074b6704,7a7a9c929247,23a53c013f1e..fdcdbb652915
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@@@ -28,8 -28,35 -28,36 -28,36 +28,7 @@@@@
    #include "internal.h"
    #include "sleep.h"
    
 ---u8 wake_sleep_flags = ACPI_NO_OPTIONAL_METHODS;
 ---static unsigned int gts, bfs;
 ---static int set_param_wake_flag(const char *val, struct kernel_param *kp)
 ---{
 ---	int ret = param_set_int(val, kp);
 ---
 ---	if (ret)
 ---		return ret;
 ---
 ---	if (kp->arg == (const char *)&gts) {
 ---		if (gts)
 ---			wake_sleep_flags |= ACPI_EXECUTE_GTS;
 ---		else
 ---			wake_sleep_flags &= ~ACPI_EXECUTE_GTS;
 ---	}
 ---	if (kp->arg == (const char *)&bfs) {
 ---		if (bfs)
 ---			wake_sleep_flags |= ACPI_EXECUTE_BFS;
 ---		else
 ---			wake_sleep_flags &= ~ACPI_EXECUTE_BFS;
 ---	}
 ---	return ret;
 ---}
 ---module_param_call(gts, set_param_wake_flag, param_get_int, &gts, 0644);
 ---module_param_call(bfs, set_param_wake_flag, param_get_int, &bfs, 0644);
 ---MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
 ---MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
 ---
    static u8 sleep_states[ACPI_S_STATE_COUNT];
- --static bool pwr_btn_event_pending;
    
    static void acpi_sleep_tts_switch(u32 acpi_state)
    {