diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /arch/i386/power/cpu.c | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/i386/power/cpu.c')
| -rw-r--r-- | arch/i386/power/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c index 50a0bef8c85f..79b2370c7fac 100644 --- a/arch/i386/power/cpu.c +++ b/arch/i386/power/cpu.c | |||
| @@ -92,7 +92,7 @@ void __restore_processor_state(struct saved_context *ctxt) | |||
| 92 | write_cr4(ctxt->cr4); | 92 | write_cr4(ctxt->cr4); |
| 93 | write_cr3(ctxt->cr3); | 93 | write_cr3(ctxt->cr3); |
| 94 | write_cr2(ctxt->cr2); | 94 | write_cr2(ctxt->cr2); |
| 95 | write_cr2(ctxt->cr0); | 95 | write_cr0(ctxt->cr0); |
| 96 | 96 | ||
| 97 | /* | 97 | /* |
| 98 | * now restore the descriptor tables to their proper values | 98 | * now restore the descriptor tables to their proper values |