diff options
Diffstat (limited to 'arch/x86/mm/pat.c')
| -rw-r--r-- | arch/x86/mm/pat.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 320d644a8107..65105b1195a3 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -76,14 +76,15 @@ void pat_init(void) | |||
| 76 | return; | 76 | return; |
| 77 | 77 | ||
| 78 | /* Paranoia check. */ | 78 | /* Paranoia check. */ |
| 79 | if (!cpu_has_pat) { | 79 | if (!cpu_has_pat && boot_pat_state) { |
| 80 | printk(KERN_ERR "PAT enabled, but CPU feature cleared\n"); | ||
| 81 | /* | 80 | /* |
| 82 | * Panic if this happens on the secondary CPU, and we | 81 | * If this happens we are on a secondary CPU, but |
| 83 | * switched to PAT on the boot CPU. We have no way to | 82 | * switched to PAT on the boot CPU. We have no way to |
| 84 | * undo PAT. | 83 | * undo PAT. |
| 85 | */ | 84 | */ |
| 86 | BUG_ON(boot_pat_state); | 85 | printk(KERN_ERR "PAT enabled, " |
| 86 | "but not supported by secondary CPU\n"); | ||
| 87 | BUG(); | ||
| 87 | } | 88 | } |
| 88 | 89 | ||
| 89 | /* Set PWT to Write-Combining. All other bits stay the same */ | 90 | /* Set PWT to Write-Combining. All other bits stay the same */ |