From 1a36307fb554c08e3415e4791722d1604f5db9cf Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Tue, 29 Jun 2010 18:38:00 +0000
Subject: [PATCH] --- yaml --- r: 203249 b: refs/heads/master c:
 ea812ca1b06113597adcd8e70c0f84a413d97544 h: refs/heads/master i:   203247:
 eef3cec10bab7ff98d3d4f7d70be21f3a6ffa3b5 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/include/asm/system.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff2c33450cdf..2b02a1c58f63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb836a977f71f76ccbb1ff35b9c113ace96377e9
+refs/heads/master: ea812ca1b06113597adcd8e70c0f84a413d97544
diff --git a/trunk/arch/x86/include/asm/system.h b/trunk/arch/x86/include/asm/system.h
index b8fe48ee2ed9..b4293fc8b798 100644
--- a/trunk/arch/x86/include/asm/system.h
+++ b/trunk/arch/x86/include/asm/system.h
@@ -457,4 +457,13 @@ 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.
+ *
+ * Based on this we disable the IP header alignment in network drivers.
+ */
+#define NET_IP_ALIGN	0
+#endif
 #endif /* _ASM_X86_SYSTEM_H */