aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2011-09-15 18:34:28 +0100
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:49:17 -0700
commita92696e10ebc5586353f40e974483e193f210b81 (patch)
treeb045fd40ced035e1cf2d8673eafb9cbf4b08e213 /debian.master
parentc99ad503e12d87c79382c0a7907feffa92713e39 (diff)
downloadlinux-linaro-precise-a92696e10ebc5586353f40e974483e193f210b81.tar.gz
UBUNTU: [Config] standardise on HZ=250
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> Acked-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/amd64/config.common.amd644
-rw-r--r--debian.master/config/config.common.ubuntu2
-rw-r--r--debian.master/config/i386/config.common.i3862
-rw-r--r--debian.master/config/powerpc/config.common.powerpc2
-rw-r--r--debian.master/config/ppc64/config.common.ppc642
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 29c3f74aeab..9e0efc14a37 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -101,9 +101,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 a80c85a7fd0..99bac6017bf 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2055,7 +2055,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 67515de9d2c..5521e801237 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -102,8 +102,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 ae621c38d02..1bb25d76184 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -89,8 +89,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 0bbf33f49e7..ea89eed1298 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -101,8 +101,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