diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-31 00:54:42 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-31 03:36:59 +0100 |
| commit | 25bc5293e404d2f25e57edf03b931d417618d6fd (patch) | |
| tree | 5e6f6724586997cda781a2661ba46534889513ad | |
| parent | cc7402b9b0ff50ce0067a8ae4e8fd5cdf8fafc5e (diff) | |
linux-openmoko-2.6.32: upgrade to latest stable patch 2.6.32.7
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch | 42 | ||||
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32_git.bb | 8 |
2 files changed, 47 insertions, 3 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch b/recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch new file mode 100644 index 0000000000..52f6e6b6b3 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch @@ -0,0 +1,42 @@ +From patchwork Sat Jan 30 15:56:13 2010 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [-stable,2.6.32.7] clocksource: fix compilation if no GENERIC_TIME +Date: Sat, 30 Jan 2010 15:56:13 -0000 +From: Aaro Koskinen <aaro.koskinen@iki.fi> +X-Patchwork-Id: 75896 + +See http://patchwork.kernel.org/patch/75896/ + +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 a dummy implementation of clocksource_max_deferment() for such +platforms. + +Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> + +--- +kernel/time/clocksource.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c +index 5155dc3..7b3a9d0 100644 +--- a/kernel/time/clocksource.c ++++ b/kernel/time/clocksource.c +@@ -502,6 +502,11 @@ static void clocksource_select(void) + + #else /* CONFIG_GENERIC_TIME */ + ++static inline u64 clocksource_max_deferment(struct clocksource *cs) ++{ ++ return 0; ++} ++ + static inline void clocksource_select(void) { } + + #endif diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb index ad1389b440..d66f29f0e5 100644 --- a/recipes/linux/linux-openmoko-2.6.32_git.bb +++ b/recipes/linux/linux-openmoko-2.6.32_git.bb @@ -3,7 +3,7 @@ require linux-openmoko.inc DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones" -KERNEL_RELEASE="2.6.32.5" +KERNEL_RELEASE="2.6.32.7" OEV = "oe1" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" @@ -16,6 +16,8 @@ SRC_URI = "\ file://defconfig \ # build fix file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \ +# needed only for 2.6.32.7+ + file://fix.compilation.if.no.GENERIC_TIME.patch;patch=1 \ # patches from Weiss's gdrm-2.6.31 branch file://0001-DRM-for-platform-devices.patch;patch=1 \ file://0002-Glamo-DRM-and-KMS-driver.patch;patch=1 \ @@ -26,8 +28,8 @@ SRC_URI = "\ file://0002-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch;patch=1 \ " -SRC_URI[stablepatch.md5sum] = "49e6bc73c7a7f690fe7ddf09fe2b5d06" -SRC_URI[stablepatch.sha256sum] = "b4d0d667db5094fd430ed58955f4f9ed71d278d5ce70e63d287c53f8db028ac3" +SRC_URI[stablepatch.md5sum] = "a68305d3e77dddc9555ba58f678a1ce2" +SRC_URI[stablepatch.sha256sum] = "b3382d02ec25e3ae86fac7852ba540e59af770a76604d317b39df57505b376bf" S = "${WORKDIR}/git" |