Message ID | 1278711969.3633.9.camel@black |
---|---|
State | Accepted |
Headers | show |
On 07/09/2010 03:46 PM, Mathieu Poirier wrote: >> From 2f5430af566785e6e4991bfc9da28b8760ea96cd Mon Sep 17 00:00:00 2001 > From: Mathieu J. Poirier<mathieu.poirier@canonical.com> > Date: Fri, 9 Jul 2010 15:38:39 -0600 > Subject: [PATCH] UBUNTU: ARM: Turning CONFIG_CPU_IDLE back on. > > This bug was fix in v2.6.35-rc4 by commit > c01ec7b1ea61b1c7febfe09d7751a4d916194aaf. The wrong register > was read after turning the feature on, causing undetermined > behavior. > > BugLink: https://bugs/launchpad.net/bugs/594382 > > Signed-off-by: Mathieu Poirier<mathieu.poirier@canonical.com> > --- > 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, 1 insertions(+), 3 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index eb8c710..03a1d8e 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -26,7 +26,6 @@ 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 80bfdac..b948230 100644 > --- a/debian.master/config/armel/config.common.armel > +++ b/debian.master/config/armel/config.common.armel > @@ -8,7 +8,6 @@ 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 b8c2bd8..f4a7a05 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -786,6 +786,7 @@ 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 388fe35..97cec96 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -24,7 +24,6 @@ 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 applied
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index eb8c710..03a1d8e 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -26,7 +26,6 @@ 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 80bfdac..b948230 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -8,7 +8,6 @@ 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 b8c2bd8..f4a7a05 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -786,6 +786,7 @@ 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 388fe35..97cec96 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -24,7 +24,6 @@ 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