diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/asm-x86_64/suspend.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/suspend.h')
| -rw-r--r-- | include/asm-x86_64/suspend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/suspend.h b/include/asm-x86_64/suspend.h index ec745807feae..bb9f40597d09 100644 --- a/include/asm-x86_64/suspend.h +++ b/include/asm-x86_64/suspend.h | |||
| @@ -16,7 +16,7 @@ arch_prepare_suspend(void) | |||
| 16 | struct saved_context { | 16 | struct saved_context { |
| 17 | u16 ds, es, fs, gs, ss; | 17 | u16 ds, es, fs, gs, ss; |
| 18 | unsigned long gs_base, gs_kernel_base, fs_base; | 18 | unsigned long gs_base, gs_kernel_base, fs_base; |
| 19 | unsigned long cr0, cr2, cr3, cr4; | 19 | unsigned long cr0, cr2, cr3, cr4, cr8; |
| 20 | u16 gdt_pad; | 20 | u16 gdt_pad; |
| 21 | u16 gdt_limit; | 21 | u16 gdt_limit; |
| 22 | unsigned long gdt_base; | 22 | unsigned long gdt_base; |