diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
| commit | f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 (patch) | |
| tree | a453a270fc86ada85d808487c911387739ce2296 /arch/i386/power/cpu.c | |
| parent | df8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff) | |
| parent | 705af309505681f197f81618440954d10f120dc0 (diff) | |
Merge branch 'from-linus' into upstream
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 50a0bef8c85..79b2370c7fa 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) write_cr4(ctxt->cr4); write_cr3(ctxt->cr3); write_cr2(ctxt->cr2); - write_cr2(ctxt->cr0); + write_cr0(ctxt->cr0); /* * now restore the descriptor tables to their proper values |