aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-04-22 23:03:17 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-04-23 16:29:07 -0400
commit2a14e541ed87bca0c125b82961ca3c6f808607d2 (patch)
treeceef81f47794797056245f8f557f5ede1ceea3ec /arch
parentcbf2829b61c136edcba302a5e1b6b40e97d32c00 (diff)
ACPI: Convert wake_sleep_flags to a value instead of function
With commit a2ef5c4fd44ce3922435139393b89f2cce47f576 "ACPI: Move module parameter gts and bfs to sleep.c" the wake_sleep_flags is required when calling acpi_enter_sleep_state, which means that if there are functions outside the sleep.c code they can't get the wake_sleep_flags values. This converts the function in to a exported value and converts the module config operands to a function. Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Lin Ming <ming.m.lin@intel.com> [v2: Parameters can be turned on/off dynamically] [v3: unsigned char -> u8] [v4: val -> kp->arg] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Link: http://lkml.kernel.org/r/1335150198-21899-2-git-send-email-konrad.wilk@oracle.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/acpi/sleep.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h
index 416d4be13fef..fe5fdda5dcd7 100644
--- a/arch/x86/kernel/acpi/sleep.h
+++ b/arch/x86/kernel/acpi/sleep.h
@@ -9,6 +9,8 @@ extern long saved_magic;
9 9
10extern int wakeup_pmode_return; 10extern int wakeup_pmode_return;
11 11
12extern u8 wake_sleep_flags;
13
12extern unsigned long acpi_copy_wakeup_routine(unsigned long); 14extern unsigned long acpi_copy_wakeup_routine(unsigned long);
13extern void wakeup_long64(void); 15extern void wakeup_long64(void);
14 16