projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
reboot.c
diff --git
a/arch/x86/kernel/reboot.c
b/arch/x86/kernel/reboot.c
index
8fd3ced
..
09d6bde
100644
(file)
--- a/
arch/x86/kernel/reboot.c
+++ b/
arch/x86/kernel/reboot.c
@@
-121,7
+121,7
@@
void __noreturn machine_real_restart(unsigned int type)
write_cr3(real_mode_header->trampoline_pgd);
/* Exiting long mode will fail if CR4.PCIDE is set. */
- if (
static
_cpu_has(X86_FEATURE_PCID))
+ if (
boot
_cpu_has(X86_FEATURE_PCID))
cr4_clear_bits(X86_CR4_PCIDE);
#endif