diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-05 08:42:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-05 08:42:45 +0200 |
| commit | a1716d508abf77e4bd02c275ab9293b9866929f3 (patch) | |
| tree | 57195a0cfc8bdc353f163a8b3b53c8d99c2562e8 /arch/x86/kernel/acpi/realmode/wakeup.h | |
| parent | 64e83b5a919a65eb35b63dd7e07c188379ff8ce6 (diff) | |
| parent | 4b4f7280d7fd1feeff134c2cf2db32fd583b6c29 (diff) | |
| download | kernel-crypto-a1716d508abf77e4bd02c275ab9293b9866929f3.tar.gz kernel-crypto-a1716d508abf77e4bd02c275ab9293b9866929f3.tar.xz kernel-crypto-a1716d508abf77e4bd02c275ab9293b9866929f3.zip | |
Merge branch 'x86/s2ram-fix' into x86/urgent
Diffstat (limited to 'arch/x86/kernel/acpi/realmode/wakeup.h')
| -rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.h b/arch/x86/kernel/acpi/realmode/wakeup.h index ef8166fe802..69d38d0b2b6 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.h +++ b/arch/x86/kernel/acpi/realmode/wakeup.h @@ -24,6 +24,11 @@ struct wakeup_header { u32 realmode_flags; u32 real_magic; u16 trampoline_segment; /* segment with trampoline code, 64-bit only */ + u8 _pad1; + u8 wakeup_jmp; + u16 wakeup_jmp_off; + u16 wakeup_jmp_seg; + u64 wakeup_gdt[3]; u32 signature; /* To check we have correct structure */ } __attribute__((__packed__)); |