[Maverick] [PATCH 1/1] UBUNTU: [Config] Enable CONFIG_M686=y

Wed Jul 21 14:29:45 UTC 2010

>From 22cfcab437a3d3fe2a18ac8b32830caa39956f53 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Wed, 21 Jul 2010 16:07:37 +0200
Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_M686=y

https://blueprints.launchpad.net/ubuntu/+spec/foundations-m-686-compile

The compilers on the i386 architecture are being set to default to i686.
Reflect the same changes in the kernel by enabling CONFIG_M686=y.

This will also resolve the following bug.

BugLink: http://bugs.launchpad.net/bugs/592495

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    3 +--
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/config.common.ubuntu          |    4 +++-
 debian.master/config/i386/config.common.i386       |    2 ++
 debian.master/config/i386/config.flavour.generic   |    3 ---
 .../config/i386/config.flavour.generic-pae         |    3 ---
 debian.master/config/i386/config.flavour.virtual   |    3 ---
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 0f25e8e..4893574 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -91,8 +91,7 @@ CONFIG_LIRC_DEV=m
 CONFIG_LLC=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
+# CONFIG_M686 is not set
 CONFIG_MEMSTICK=m
 CONFIG_MFD_JANZ_CMODIO=m
 # CONFIG_MFD_TMIO is not set
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index a40b19f..cf782d8 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -29,6 +29,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 # CONFIG_INTR_REMAP is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_LAPBETHER is not set
+# CONFIG_M686 is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 CONFIG_MII=y
 CONFIG_MMC_BLOCK=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 194e437..298a74b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2417,8 +2417,9 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_M25PXX_USE_FAST_READ=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
+# CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
+# CONFIG_M586TSC is not set
 CONFIG_MA600_DONGLE=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_DEBUGFS=y
@@ -5001,6 +5002,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
 # CONFIG_X86_UV is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_X86_VSMP is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e5c00b4..3929781 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -93,6 +93,7 @@ CONFIG_LIRC_DEV=m
 CONFIG_LLC=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
+CONFIG_M686=y
 CONFIG_MEMSTICK=m
 CONFIG_MFD_JANZ_CMODIO=m
 # CONFIG_MFD_TMIO is not set
@@ -284,6 +285,7 @@ CONFIG_X25_ASY=m
 CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_SPEEDSTEP_LIB=y
 # CONFIG_X86_X2APIC is not set
 # CONFIG_ZONE_DMA32 is not set
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index dde7160..af17ec8 100644
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -4,8 +4,6 @@
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
-CONFIG_M586=y
-# CONFIG_M586TSC is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SYM53C8XX_2=m
@@ -15,4 +13,3 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index 4ec3e52..d227cdc 100644
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -4,8 +4,6 @@
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
-# CONFIG_M586 is not set
-CONFIG_M586TSC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_SYM53C8XX_2=y
@@ -15,4 +13,3 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
index 8b500bc..b006b26 100644
--- a/debian.master/config/i386/config.flavour.virtual
+++ b/debian.master/config/i386/config.flavour.virtual
@@ -4,8 +4,6 @@
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
-# CONFIG_M586 is not set
-CONFIG_M586TSC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_SYM53C8XX_2=y
@@ -15,4 +13,3 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-- 
1.7.0.4





