---

yaml --- r: 203249 b: refs/heads/master c: ea812ca h: refs/heads/master i: 203247: eef3cec v: v3
git-mirror · Jun 30, 2010 · 1a36307 · 1a36307
1 parent 93878fa
commit 1a36307
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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 */