X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fcpu%2Fcommon.c;fp=arch%2Fx86%2Fkernel%2Fcpu%2Fcommon.c;h=b3410f1ac21754c9ff94338a71da12e812d65686;hp=0f8885949e8c4b602fefc2eaf918d11a2957c051;hb=c22ccc4a3ef198752855f44e9279732260c889d5;hpb=7fd2bf83d59a2d32e0d596c5d3e623b9a0e7e2d5

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 0f8885949e8c..b3410f1ac217 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -326,6 +326,7 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
 #ifdef CONFIG_X86_SMAP
 		cr4_set_bits(X86_CR4_SMAP);
 #else
+		clear_cpu_cap(c, X86_FEATURE_SMAP);
 		cr4_clear_bits(X86_CR4_SMAP);
 #endif
 	}