This patch updates to 2.6.32.7 and adds clocksource-fix-compilation-if-no-generic_time.patch patch, otherwise it won't compile on platforms which don't implement GENERIC_TIME. Compilation ends with following error:
kernel/time/clocksource.c: In function 'clocksource_register': kernel/time/clocksource.c:556: error: implicit declaration of function 'clocksource_max_deferment' Signed-off-by: Petr Štetiar <[email protected]> --- conf/checksums.ini | 4 ++ ...source-fix-compilation-if-no-generic_time.patch | 48 ++++++++++++++++++++ recipes/linux/linux_2.6.32.bb | 5 +- 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 recipes/linux/linux-2.6.32/clocksource-fix-compilation-if-no-generic_time.patch diff --git a/conf/checksums.ini b/conf/checksums.ini index 0478fa5..98aba73 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21794,6 +21794,10 @@ sha256=d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60 md5=49e6bc73c7a7f690fe7ddf09fe2b5d06 sha256=b4d0d667db5094fd430ed58955f4f9ed71d278d5ce70e63d287c53f8db028ac3 +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.7.bz2] +md5=a68305d3e77dddc9555ba58f678a1ce2 +sha256=b3382d02ec25e3ae86fac7852ba540e59af770a76604d317b39df57505b376bf + [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2] md5=d6249654087f0bcafaa860ac573316a4 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac diff --git a/recipes/linux/linux-2.6.32/clocksource-fix-compilation-if-no-generic_time.patch b/recipes/linux/linux-2.6.32/clocksource-fix-compilation-if-no-generic_time.patch new file mode 100644 index 0000000..f6f9885 --- /dev/null +++ b/recipes/linux/linux-2.6.32/clocksource-fix-compilation-if-no-generic_time.patch @@ -0,0 +1,48 @@ +From [email protected] Mon Feb 1 13:24:31 2010 +From: Aaro Koskinen <[email protected]> +Date: Mon, 1 Feb 2010 18:24:58 +0200 +Subject: clocksource: fix compilation if no GENERIC_TIME +To: [email protected], [email protected], [email protected], [email protected] +Message-ID: <[email protected]> + +From: Aaro Koskinen <[email protected]> + +commit a362c638bdf052bf424bce7645d39b101090f6ba upstream + +Commit a9238ce3bb0fda6e760780b702c6cbd3793087d3 broke compilation on +platforms that do not implement GENERIC_TIME (e.g. iop32x): + + kernel/time/clocksource.c: In function 'clocksource_register': + kernel/time/clocksource.c:556: error: implicit declaration of function 'clocksource_max_deferment' + +Provide the implementation of clocksource_max_deferment() also for +such platforms. + +Signed-off-by: Aaro Koskinen <[email protected]> +Cc: Thomas Gleixner <[email protected]> +Signed-off-by: Greg Kroah-Hartman <[email protected]> + +--- + kernel/time/clocksource.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/kernel/time/clocksource.c ++++ b/kernel/time/clocksource.c +@@ -413,8 +413,6 @@ void clocksource_touch_watchdog(void) + clocksource_resume_watchdog(); + } + +-#ifdef CONFIG_GENERIC_TIME +- + /** + * clocksource_max_deferment - Returns max time the clocksource can be deferred + * @cs: Pointer to clocksource +@@ -456,6 +454,8 @@ static u64 clocksource_max_deferment(str + return max_nsecs - (max_nsecs >> 5); + } + ++#ifdef CONFIG_GENERIC_TIME ++ + /** + * clocksource_select - Select the best clocksource available + * diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb index 560ff42..36fc3cc 100644 --- a/recipes/linux/linux_2.6.32.bb +++ b/recipes/linux/linux_2.6.32.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r5" +PR = "r6" S = "${WORKDIR}/linux-${PV}" @@ -22,7 +22,8 @@ DEFAULT_PREFERENCE_jornada6xx = "-1" DEFAULT_PREFERENCE_jornada7xx = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.5.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;patch=1 \ + file://clocksource-fix-compilation-if-no-generic_time.patch;patch=1 \ file://defconfig" SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879" -- 1.6.0.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
