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 /recipes/linux/linux-openmoko-2.6.32 | |
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>
Diffstat (limited to 'recipes/linux/linux-openmoko-2.6.32')
-rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch | 42 |
1 files changed, 42 insertions, 0 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 |