diff --git a/[refs] b/[refs] index 41ed4983cf15..2bdd1ac24442 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bcff60f7ce88c09a2bc1302ff14510737bfcb7b +refs/heads/master: ed7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41 diff --git a/trunk/include/asm-i386/system.h b/trunk/include/asm-i386/system.h index 609756c61676..d69ba937e092 100644 --- a/trunk/include/asm-i386/system.h +++ b/trunk/include/asm-i386/system.h @@ -214,11 +214,6 @@ static inline unsigned long get_limit(unsigned long segment) */ -/* - * Actually only lfence would be needed for mb() because all stores done - * by the kernel should be already ordered. But keep a full barrier for now. - */ - #define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2) #define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)