From patchwork Mon Jun 21 23:30:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 56376 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 8C8FAB7085 for ; Tue, 22 Jun 2010 09:30:57 +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 1OQqRy-0007pe-Im; Tue, 22 Jun 2010 00:30:46 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OQqRw-0007pP-Uy for kernel-team@lists.ubuntu.com; Tue, 22 Jun 2010 00:30:45 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OQqRw-0004VV-5M for ; Tue, 22 Jun 2010 00:30:44 +0100 Received: from s0106002369de4dac.cg.shawcable.net ([70.73.24.112] helo=[192.168.1.103]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OQqRv-0001MJ-P5 for kernel-team@lists.ubuntu.com; Tue, 22 Jun 2010 00:30:44 +0100 Subject: [Maverick][PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap From: Mathieu Poirier To: kernel-team@lists.ubuntu.com Date: Mon, 21 Jun 2010 17:30:41 -0600 Message-ID: <1277163041.30417.1.camel@black> 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 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001 From: Mathieu J. Poirier Date: Mon, 21 Jun 2010 17:19:46 -0600 Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap This is a temperary fix that allow the system to be usable. The real fix, the one that really correct what seems to be an issue with retreiving the value of the PM_WKST_WKUP register should follow shortly. BugLink: https://bugs/launchpad.net/bugs/594382 Signed-off-by: Mathieu Poirier --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + 4 files changed, 3 insertions(+), 1 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index fd43848..783b7ac 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -26,6 +26,7 @@ CONFIG_CDROM_PKTCDVD=y CONFIG_CEPH_FS=m CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_COMEDI=m +CONFIG_CPU_IDLE=y CONFIG_CRYPTO_HMAC=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DISPLAY_SUPPORT=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index ba002ce..262a404 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -8,6 +8,7 @@ CONFIG_ASYNC_TX_DMA=y CONFIG_ATM_BR2684_IPFILTER=y CONFIG_ATM_DUMMY=m # CONFIG_COMEDI is not set +# CONFIG_CPU_IDLE is not set CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 902ea7d..231120b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -787,7 +787,6 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_HAS_ASID=y CONFIG_CPU_HAS_PMU=y # CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_NOTIFIER_ERROR_INJECT=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index d883dd0..92110fd 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -24,6 +24,7 @@ CONFIG_CDROM_PKTCDVD=y CONFIG_CEPH_FS=m CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_COMEDI=m +CONFIG_CPU_IDLE=y CONFIG_CRYPTO_HMAC=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set