diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
| commit | 6a47a12fee7d1e842369798dc8134759561d5e75 (patch) | |
| tree | 14fec57680c2fbc8dc05376b5c14bf57996dc86f /arch/x86/realmode/init.c | |
| parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
| parent | ea5dd38e93b3bec3427e5d3eef000bbf5d637e76 (diff) | |
Merge tag 'v3.18.17' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18lsk-v3.18-15.07
Linux 3.18.17
Diffstat (limited to 'arch/x86/realmode/init.c')
| -rw-r--r-- | arch/x86/realmode/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index bad628a620c4..0b7a63d98440 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -81,7 +81,7 @@ void __init setup_real_mode(void) trampoline_header->start = (u64) secondary_startup_64; trampoline_cr4_features = &trampoline_header->cr4; - *trampoline_cr4_features = read_cr4(); + *trampoline_cr4_features = __read_cr4(); trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd); trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd; |