diff --git a/[refs] b/[refs] index fbe629205913..36af4190af25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a20d3ecf5c2a6435df2b756435b1eb1c657d45b +refs/heads/master: 4e09e21ccb0dfe7ee8d5641192e0072e83bd916b diff --git a/trunk/include/asm-x86/system.h b/trunk/include/asm-x86/system.h index a2f04cd79b29..7e4c133795a1 100644 --- a/trunk/include/asm-x86/system.h +++ b/trunk/include/asm-x86/system.h @@ -289,7 +289,7 @@ static inline void native_wbinvd(void) #endif/* CONFIG_PARAVIRT */ -#define stts() write_cr0(8 | read_cr0()) +#define stts() write_cr0(read_cr0() | X86_CR0_TS) #endif /* __KERNEL__ */