diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-05 09:54:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-05 09:54:49 +0200 |
| commit | 4241119eeb14f762e2d7f6e7c52afd22cea1de37 (patch) | |
| tree | 655a153ca0517acb93b1eea776bad49ce5d8b050 /arch/x86/mm | |
| parent | e73ad5ff2f76da25390e9607cb549691639330c3 (diff) | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
Merge tag 'v4.12-rc4' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pageattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 1dcd2be4cce4..c8520b2c62d2 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -186,7 +186,7 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache) unsigned int i, level; unsigned long addr; - BUG_ON(irqs_disabled()); + BUG_ON(irqs_disabled() && !early_boot_irqs_disabled); WARN_ON(PAGE_ALIGN(start) != start); on_each_cpu(__cpa_flush_range, NULL, 1); |