diff options
Diffstat (limited to 'arch/x86/kernel/tboot.c')
-rw-r--r-- | arch/x86/kernel/tboot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 6410744ac5c..f84fe00fad4 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <linux/mm.h> | 32 | #include <linux/mm.h> |
33 | #include <linux/tboot.h> | 33 | #include <linux/tboot.h> |
34 | 34 | ||
35 | #include <asm/trampoline.h> | 35 | #include <asm/realmode.h> |
36 | #include <asm/processor.h> | 36 | #include <asm/processor.h> |
37 | #include <asm/bootparam.h> | 37 | #include <asm/bootparam.h> |
38 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
@@ -44,7 +44,7 @@ | |||
44 | #include <asm/e820.h> | 44 | #include <asm/e820.h> |
45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
46 | 46 | ||
47 | #include "acpi/realmode/wakeup.h" | 47 | #include "../realmode/rm/wakeup.h" |
48 | 48 | ||
49 | /* Global pointer to shared data; NULL means no measured launch. */ | 49 | /* Global pointer to shared data; NULL means no measured launch. */ |
50 | struct tboot *tboot __read_mostly; | 50 | struct tboot *tboot __read_mostly; |
@@ -201,7 +201,8 @@ static int tboot_setup_sleep(void) | |||
201 | add_mac_region(e820.map[i].addr, e820.map[i].size); | 201 | add_mac_region(e820.map[i].addr, e820.map[i].size); |
202 | } | 202 | } |
203 | 203 | ||
204 | tboot->acpi_sinfo.kernel_s3_resume_vector = acpi_wakeup_address; | 204 | tboot->acpi_sinfo.kernel_s3_resume_vector = |
205 | real_mode_header->wakeup_start; | ||
205 | 206 | ||
206 | return 0; | 207 | return 0; |
207 | } | 208 | } |