From e1b6a7c68898ddd6fb738c3c096c7470b16a8c92 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Wed, 28 Mar 2012 11:51:17 -0700
Subject: [PATCH] --- yaml --- r: 298569 b: refs/heads/master c:
 c0e9afc0da6cb0f11497e5ea83377b3c451450e0 h: refs/heads/master i:   298567:
 0f0c24901c3adbc73524bc7ec19aa9635dd07666 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/x86/Makefile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 962c4549bd9e..a20c2e621f5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6365201d8a21fb347260f89d6e9b3e718d63c70
+refs/heads/master: c0e9afc0da6cb0f11497e5ea83377b3c451450e0
diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile
index 968dbe24a255..41a7237606a3 100644
--- a/trunk/arch/x86/Makefile
+++ b/trunk/arch/x86/Makefile
@@ -129,6 +129,7 @@ KBUILD_CFLAGS += -Wno-sign-compare
 KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
 # prevent gcc from generating any FP code by mistake
 KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
+KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
 
 KBUILD_CFLAGS += $(mflags-y)
 KBUILD_AFLAGS += $(mflags-y)