| Message ID | 1316108068-1182-2-git-send-email-apw@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 09/15/2011 11:34 AM, Andy Whitcroft wrote: > For a couple of releases we have had an inconsistant HZ for amd64, this > has been reviewed a number of times and been deferred pending a more > thorough review. At this stage it seem safer to simply standardise on > a common HZ=250 across all architectures which can support it until any > review is completed. > > Signed-off-by: Andy Whitcroft<apw@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 4 +--- > debian.master/config/config.common.ubuntu | 2 ++ > debian.master/config/i386/config.common.i386 | 2 -- > debian.master/config/powerpc/config.common.powerpc | 2 -- > debian.master/config/ppc64/config.common.ppc64 | 2 -- > 5 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 8ea6288..e043c17 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -99,9 +99,7 @@ CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y > # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set > CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_HUGETLB_PAGE=y > -CONFIG_HZ=100 > -CONFIG_HZ_100=y > -# CONFIG_HZ_250 is not set > +CONFIG_HZ=250 > CONFIG_I2C_ALGOBIT=m > # CONFIG_I2C_HELPER_AUTO is not set > CONFIG_I2C_I801=m > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 80de39d..9d21ccc 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -2023,7 +2023,9 @@ CONFIG_HYPERV_STORAGE=m > CONFIG_HYPERV_UTILS=m > CONFIG_HYSDN=m > CONFIG_HYSDN_CAPI=y > +# CONFIG_HZ_100 is not set > # CONFIG_HZ_1000 is not set > +CONFIG_HZ_250=y > # CONFIG_HZ_300 is not set > CONFIG_I2C=y > CONFIG_I2C_ALGOPCA=m > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index aa1429c..393bdf8 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -101,8 +101,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_HIGHMEM=y > CONFIG_HUGETLB_PAGE=y > CONFIG_HZ=250 > -# CONFIG_HZ_100 is not set > -CONFIG_HZ_250=y > CONFIG_I2C_ALGOBIT=m > # CONFIG_I2C_HELPER_AUTO is not set > CONFIG_I2C_I801=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 2b2ed21..d0f8763 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -88,8 +88,6 @@ CONFIG_GPIO_VX855=m > CONFIG_HIGHMEM=y > # CONFIG_HVC_CONSOLE is not set > CONFIG_HZ=250 > -# CONFIG_HZ_100 is not set > -CONFIG_HZ_250=y > CONFIG_I2C_ALGOBIT=y > CONFIG_I2C_HELPER_AUTO=y > CONFIG_I2C_I801=m > diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 > index 351573c..d2587c0 100644 > --- a/debian.master/config/ppc64/config.common.ppc64 > +++ b/debian.master/config/ppc64/config.common.ppc64 > @@ -100,8 +100,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_HUGETLB_PAGE=y > CONFIG_HVC_CONSOLE=y > CONFIG_HZ=250 > -# CONFIG_HZ_100 is not set > -CONFIG_HZ_250=y > CONFIG_I2C_ALGOBIT=y > CONFIG_I2C_HELPER_AUTO=y > CONFIG_I2C_I801=m Acked-by: Tim Gardner <tim.gardner@canonical.com>
On Thu, 2011-09-15 at 18:34 +0100, Andy Whitcroft wrote: > For a couple of releases we have had an inconsistant HZ for amd64, this > has been reviewed a number of times and been deferred pending a more > thorough review. At this stage it seem safer to simply standardise on > a common HZ=250 across all architectures which can support it until any > review is completed. > > Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Applied to Oneiric master-next. Thanks, Leann > --- > debian.master/config/amd64/config.common.amd64 | 4 +--- > debian.master/config/config.common.ubuntu | 2 ++ > debian.master/config/i386/config.common.i386 | 2 -- > debian.master/config/powerpc/config.common.powerpc | 2 -- > debian.master/config/ppc64/config.common.ppc64 | 2 -- > 5 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 8ea6288..e043c17 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -99,9 +99,7 @@ CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y > # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set > CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_HUGETLB_PAGE=y > -CONFIG_HZ=100 > -CONFIG_HZ_100=y > -# CONFIG_HZ_250 is not set > +CONFIG_HZ=250 > CONFIG_I2C_ALGOBIT=m > # CONFIG_I2C_HELPER_AUTO is not set > CONFIG_I2C_I801=m > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 80de39d..9d21ccc 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -2023,7 +2023,9 @@ CONFIG_HYPERV_STORAGE=m > CONFIG_HYPERV_UTILS=m > CONFIG_HYSDN=m > CONFIG_HYSDN_CAPI=y > +# CONFIG_HZ_100 is not set > # CONFIG_HZ_1000 is not set > +CONFIG_HZ_250=y > # CONFIG_HZ_300 is not set > CONFIG_I2C=y > CONFIG_I2C_ALGOPCA=m > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index aa1429c..393bdf8 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -101,8 +101,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_HIGHMEM=y > CONFIG_HUGETLB_PAGE=y > CONFIG_HZ=250 > -# CONFIG_HZ_100 is not set > -CONFIG_HZ_250=y > CONFIG_I2C_ALGOBIT=m > # CONFIG_I2C_HELPER_AUTO is not set > CONFIG_I2C_I801=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 2b2ed21..d0f8763 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -88,8 +88,6 @@ CONFIG_GPIO_VX855=m > CONFIG_HIGHMEM=y > # CONFIG_HVC_CONSOLE is not set > CONFIG_HZ=250 > -# CONFIG_HZ_100 is not set > -CONFIG_HZ_250=y > CONFIG_I2C_ALGOBIT=y > CONFIG_I2C_HELPER_AUTO=y > CONFIG_I2C_I801=m > diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 > index 351573c..d2587c0 100644 > --- a/debian.master/config/ppc64/config.common.ppc64 > +++ b/debian.master/config/ppc64/config.common.ppc64 > @@ -100,8 +100,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_HUGETLB_PAGE=y > CONFIG_HVC_CONSOLE=y > CONFIG_HZ=250 > -# CONFIG_HZ_100 is not set > -CONFIG_HZ_250=y > CONFIG_I2C_ALGOBIT=y > CONFIG_I2C_HELPER_AUTO=y > CONFIG_I2C_I801=m > -- > 1.7.4.1 > >
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 8ea6288..e043c17 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -99,9 +99,7 @@ CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HUGETLB_PAGE=y -CONFIG_HZ=100 -CONFIG_HZ_100=y -# CONFIG_HZ_250 is not set +CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_HELPER_AUTO is not set CONFIG_I2C_I801=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 80de39d..9d21ccc 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2023,7 +2023,9 @@ CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_UTILS=m CONFIG_HYSDN=m CONFIG_HYSDN_CAPI=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_1000 is not set +CONFIG_HZ_250=y # CONFIG_HZ_300 is not set CONFIG_I2C=y CONFIG_I2C_ALGOPCA=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index aa1429c..393bdf8 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -101,8 +101,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HIGHMEM=y CONFIG_HUGETLB_PAGE=y CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_HELPER_AUTO is not set CONFIG_I2C_I801=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 2b2ed21..d0f8763 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -88,8 +88,6 @@ CONFIG_GPIO_VX855=m CONFIG_HIGHMEM=y # CONFIG_HVC_CONSOLE is not set CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_I801=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 351573c..d2587c0 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -100,8 +100,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HUGETLB_PAGE=y CONFIG_HVC_CONSOLE=y CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_I801=m
For a couple of releases we have had an inconsistant HZ for amd64, this has been reviewed a number of times and been deferred pending a more thorough review. At this stage it seem safer to simply standardise on a common HZ=250 across all architectures which can support it until any review is completed. Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 4 +--- debian.master/config/config.common.ubuntu | 2 ++ debian.master/config/i386/config.common.i386 | 2 -- debian.master/config/powerpc/config.common.powerpc | 2 -- debian.master/config/ppc64/config.common.ppc64 | 2 -- 5 files changed, 3 insertions(+), 9 deletions(-)