From patchwork Wed Jul 21 14:29:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 59443 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 3619EB70C2 for ; Thu, 22 Jul 2010 00:30:05 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1ObaJ2-00077K-7w; Wed, 21 Jul 2010 15:29:56 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1ObaJ0-00077A-Ij for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2010 15:29:54 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1ObaJ0-0004Nw-HV for ; Wed, 21 Jul 2010 15:29:54 +0100 Received: from [193.85.232.179] (helo=[10.155.1.253]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1ObaJ0-0007yY-E3 for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2010 15:29:54 +0100 Subject: [Maverick] [PATCH 1/1] UBUNTU: [Config] Enable CONFIG_M686=y From: Leann Ogasawara To: kernel-team Date: Wed, 21 Jul 2010 16:29:45 +0200 Message-ID: <1279722586.22780.454.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 22cfcab437a3d3fe2a18ac8b32830caa39956f53 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara 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 --- 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