diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-25 12:30:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-25 12:30:07 +0800 |
| commit | e5dd309b741e2e4d7e71da61e07249f91c80065e (patch) | |
| tree | 8fbed54492cf85504557bacf38a483094de725c4 /arch | |
| parent | c67d235857a13b609e664f901fb990f49796ddcc (diff) | |
| parent | a6846cfd266b48af1ee7c3c19d5cb60477ca4469 (diff) | |
Merge tag 'v3.18.44' into linux-linaro-lsk-v3.18lsk-v3.18-16.11
This is the 3.18.44 stable release
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 88635b301694..69608a4f554b 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -291,10 +291,9 @@ __setup("nosmap", setup_disable_smap); static __always_inline void setup_smap(struct cpuinfo_x86 *c) { - unsigned long eflags; + unsigned long eflags = native_save_fl(); /* This should have been cleared long ago */ - raw_local_save_flags(eflags); BUG_ON(eflags & X86_EFLAGS_AC); if (cpu_has(c, X86_FEATURE_SMAP)) { |