From 41294118ef9af099de1aea04f5b24a1b62706e41 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Thu, 1 Jul 2010 13:28:27 +0000 Subject: [PATCH] --- yaml --- r: 203341 b: refs/heads/master c: 7475271004b66e9c22e1bb28f240a38c5d6fe76e h: refs/heads/master i: 203339: 1680a9ead1100264ed6728cf7622f24b9152cea7 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/system.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ae7593a07c8..4d0ec397526e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe62c298e5bcff8b3414205b7b54975918b3b5c4 +refs/heads/master: 7475271004b66e9c22e1bb28f240a38c5d6fe76e diff --git a/trunk/arch/x86/include/asm/system.h b/trunk/arch/x86/include/asm/system.h index b4293fc8b798..1db9bd2281d7 100644 --- a/trunk/arch/x86/include/asm/system.h +++ b/trunk/arch/x86/include/asm/system.h @@ -457,7 +457,6 @@ static inline void rdtsc_barrier(void) alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); } -#ifdef CONFIG_MCORE2 /* * We handle most unaligned accesses in hardware. On the other hand * unaligned DMA can be quite expensive on some Nehalem processors. @@ -465,5 +464,4 @@ static inline void rdtsc_barrier(void) * Based on this we disable the IP header alignment in network drivers. */ #define NET_IP_ALIGN 0 -#endif #endif /* _ASM_X86_SYSTEM_H */