---

yaml --- r: 203341 b: refs/heads/master c: 7475271 h: refs/heads/master i: 203339: 1680a9e v: v3
git-mirror · Jul 2, 2010 · 4129411 · 4129411
1 parent f33017d
commit 4129411
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -457,13 +457,11 @@ 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 */