diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-18 12:05:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-18 12:05:46 +0800 |
| commit | 5289d9c979092878f2bf741d8b365ef7565fb6db (patch) | |
| tree | 845756bb908fddedb3d88515fe0b8d7ad04fc567 /arch/x86/kernel/setup.c | |
| parent | 91e52df3ad8b9c84c4f6f050e0f14127894dd8ce (diff) | |
| parent | 9e0499d7d30c6a91eb381e604c31519af88737d7 (diff) | |
Merge tag 'v4.4.77' into linux-linaro-lsk-v4.4lsk-v4.4-17.07
This is the 4.4.77 stable release
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d2bbe343fda7..e67b834279b2 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1048,6 +1048,13 @@ void __init setup_arch(char **cmdline_p) if (mtrr_trim_uncached_memory(max_pfn)) max_pfn = e820_end_of_ram_pfn(); + /* + * This call is required when the CPU does not support PAT. If + * mtrr_bp_init() invoked it already via pat_init() the call has no + * effect. + */ + init_cache_modes(); + #ifdef CONFIG_X86_32 /* max_low_pfn get updated here */ find_low_pfn_range(); |