Re: [Fwd: FW: linux-next: manual merge of the crypto tree]

[Austin Zhang <austin_zhang@linux.intel.com>]

Added Intel processor SSE4.2 feature flag.

Signed-off-by: Austin Zhang <austin.zhang@intel.com>
---
 cpufeature.h |    2 ++
 1 file changed, 2 insertions(+)

diff -Naurp linux-2.6-tip/include/asm-x86/cpufeature.h linux-2.6-tip-patch/include/asm-x86/cpufeature.h
--- linux-2.6-tip/include/asm-x86/cpufeature.h	2008-08-25 13:38:30.000000000 -0400
+++ linux-2.6-tip-patch/include/asm-x86/cpufeature.h	2008-08-25 06:17:07.000000000 -0400
@@ -92,6 +92,7 @@
 #define X86_FEATURE_CX16	(4*32+13) /* CMPXCHG16B */
 #define X86_FEATURE_XTPR	(4*32+14) /* Send Task Priority Messages */
 #define X86_FEATURE_DCA		(4*32+18) /* Direct Cache Access */
+#define X86_FEATURE_XMM4_2	(4*32+20) /* Streaming SIMD Extensions-4.2 */
 #define X86_FEATURE_X2APIC	(4*32+21) /* x2APIC */
 #define X86_FEATURE_XSAVE	(4*32+26) /* XSAVE */
 
@@ -192,6 +193,7 @@ extern const char * const x86_power_flag
 #define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)
 #define cpu_has_arch_perfmon	boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
 #define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)
+#define cpu_has_xmm4_2		boot_cpu_has(X86_FEATURE_XMM4_2)
 #define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)
 #define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)
 

On Mon, 2008-08-25 at 14:32 +0200, Ingo Molnar wrote:
> * Austin Zhang <austin_zhang@linux.intel.com> wrote:
> 
> > A standalone patch to add sse42 flags.
> 
> a proper changelog with signoffs, etc. would be nice.
> 
> > (But, Ingo, I thought this would still make conflicts when Stephen 
> > want to merge into crypto tree, right?)
> 
> i can make the commit a separate branch that you can pull. (without 
> pulling anything else)
> 
> (as long as the crypto tree is git based, which i assume it is.)
> 
> 	Ingo