diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2010-07-01 09:28:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-02 01:45:54 -0400 |
commit | 7475271004b66e9c22e1bb28f240a38c5d6fe76e (patch) | |
tree | 780205700baeec41d6ed491cf28737a1491227a8 | |
parent | fe62c298e5bcff8b3414205b7b54975918b3b5c4 (diff) |
x86: Drop CONFIG_MCORE2 check around setting of NET_IP_ALIGN
This patch removes the CONFIG_MCORE2 check from around NET_IP_ALIGN. It is
based on a suggestion from Andi Kleen. The assumption is that there are
not any x86 cores where unaligned access is really slow, and this change
would allow for a performance improvement to still exist on configurations
that are not necessarily optimized for Core 2.
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/x86/include/asm/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h index b4293fc8b798..1db9bd2281d7 100644 --- a/arch/x86/include/asm/system.h +++ b/arch/x86/include/asm/system.h | |||
@@ -457,7 +457,6 @@ static inline void rdtsc_barrier(void) | |||
457 | alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); | 457 | alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); |
458 | } | 458 | } |
459 | 459 | ||
460 | #ifdef CONFIG_MCORE2 | ||
461 | /* | 460 | /* |
462 | * We handle most unaligned accesses in hardware. On the other hand | 461 | * We handle most unaligned accesses in hardware. On the other hand |
463 | * unaligned DMA can be quite expensive on some Nehalem processors. | 462 | * unaligned DMA can be quite expensive on some Nehalem processors. |
@@ -465,5 +464,4 @@ static inline void rdtsc_barrier(void) | |||
465 | * Based on this we disable the IP header alignment in network drivers. | 464 | * Based on this we disable the IP header alignment in network drivers. |
466 | */ | 465 | */ |
467 | #define NET_IP_ALIGN 0 | 466 | #define NET_IP_ALIGN 0 |
468 | #endif | ||
469 | #endif /* _ASM_X86_SYSTEM_H */ | 467 | #endif /* _ASM_X86_SYSTEM_H */ |