From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 21 Nov 2010 22:56:33 +0000 (+0000)
Subject: x86: turn off CONFIG_X86_GENERIC for geos and net5501
X-Git-Tag: reboot~18335
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1a9b885c74004062ea086a5cd0f7cb93c0ebb574;p=openwrt%2Fstaging%2Fxback.git

x86: turn off CONFIG_X86_GENERIC for geos and net5501

CONFIG_X86_GENERIC obscures CONFIG_MGEODE_LX, etc. and causes it to use wrong cache-line size.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 24071
---

diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index 8d6e3aee6a..071f754906 100644
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -20,6 +20,8 @@ CONFIG_PROCESSOR_SELECT=y
 # CONFIG_SERIO_LIBPS2 is not set
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DS is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
diff --git a/target/linux/x86/net5501/config-default b/target/linux/x86/net5501/config-default
index 77f6337741..173602794b 100644
--- a/target/linux/x86/net5501/config-default
+++ b/target/linux/x86/net5501/config-default
@@ -34,8 +34,9 @@ CONFIG_SCSI_MOD=y
 # CONFIG_TINY_RCU is not set
 CONFIG_X86_CMOV=y
 CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y