From 4a69f84b8bb94ef74f0e322d46fe3899b426636e Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 16:29:06 +0100
Subject: [PATCH] --- yaml --- r: 23792 b: refs/heads/master c:
 dca99a38bccceda9e079d4c95abefbd9028605fe h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/Makefile.cpu | 4 ++++
 trunk/arch/x86_64/Makefile   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b34e3d3ab436..6d6e4197ac9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6
+refs/heads/master: dca99a38bccceda9e079d4c95abefbd9028605fe
diff --git a/trunk/arch/i386/Makefile.cpu b/trunk/arch/i386/Makefile.cpu
index dcd936ef45db..a11befba26d5 100644
--- a/trunk/arch/i386/Makefile.cpu
+++ b/trunk/arch/i386/Makefile.cpu
@@ -39,3 +39,7 @@ cflags-$(CONFIG_X86_ELAN)	+= -march=i486
 # Geode GX1 support
 cflags-$(CONFIG_MGEODEGX1)	+= -march=pentium-mmx
 
+# add at the end to overwrite eventual tuning options from earlier
+# cpu entries
+cflags-$(CONFIG_X86_GENERIC) 	+= $(call tune,generic)
+
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
index 7405dfd6522b..f5e48ba9bec7 100644
--- a/trunk/arch/x86_64/Makefile
+++ b/trunk/arch/x86_64/Makefile
@@ -29,6 +29,7 @@ CHECKFLAGS      += -D__x86_64__ -m64
 
 cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
 cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
+cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
 CFLAGS += $(cflags-y)
 
 CFLAGS += -m64