- Merge upstream commit fixing build breakage on ixp and enable it again.
svn path=/dists/trunk/linux-2.6/; revision=17836
This commit is contained in:
parent
c0e8d4a8be
commit
d9f3d5eadb
|
@ -14,6 +14,9 @@ linux-2.6 (3.0.0~rc7-1~experimental.1) UNRELEASED; urgency=low
|
|||
* linux-support, linux-tools: Use dh_python2 instead of dh_pysupport
|
||||
* aufs: Update for 3.0
|
||||
|
||||
[ Arnaud Patard ]
|
||||
* Merge ixp4xx build fix and enable ixp4xx back
|
||||
|
||||
-- maximilian attems <maks@debian.org> Tue, 05 Jul 2011 14:25:29 +0200
|
||||
|
||||
linux-2.6 (3.0.0~rc6-1~experimental.1) experimental; urgency=low
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
[base]
|
||||
flavours:
|
||||
iop32x
|
||||
ixp4xx
|
||||
kirkwood
|
||||
orion5x
|
||||
versatile
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
commit 900b170af40b4fef54e89f3d48d055f7d8031ae6
|
||||
Author: Richard Cochran <richardcochran@gmail.com>
|
||||
Date: Fri Jul 15 21:33:12 2011 +0200
|
||||
|
||||
ARM: fix regression in IXP4xx clocksource
|
||||
|
||||
Commit 234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868
|
||||
|
||||
clocksource: convert ARM 32-bit up counting clocksources
|
||||
|
||||
broke the build for ixp4xx and made big endian operation impossible.
|
||||
This commit restores the original behaviour.
|
||||
|
||||
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
|
||||
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
|
||||
[ Thomas says that we might want to have generic BE accessor functions
|
||||
to the MMIO clock source, but that hasn't happened yet, so in the
|
||||
meantime this seems to be the short-term fix for the particular
|
||||
problem - Linus ]
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
|
||||
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
|
||||
index 74ed81a..0777257 100644
|
||||
--- a/arch/arm/mach-ixp4xx/common.c
|
||||
+++ b/arch/arm/mach-ixp4xx/common.c
|
||||
@@ -419,14 +419,20 @@ static void notrace ixp4xx_update_sched_clock(void)
|
||||
/*
|
||||
* clocksource
|
||||
*/
|
||||
+
|
||||
+static cycle_t ixp4xx_clocksource_read(struct clocksource *c)
|
||||
+{
|
||||
+ return *IXP4XX_OSTS;
|
||||
+}
|
||||
+
|
||||
unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
|
||||
EXPORT_SYMBOL(ixp4xx_timer_freq);
|
||||
static void __init ixp4xx_clocksource_init(void)
|
||||
{
|
||||
init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);
|
||||
|
||||
- clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32,
|
||||
- clocksource_mmio_readl_up);
|
||||
+ clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32,
|
||||
+ ixp4xx_clocksource_read);
|
||||
}
|
||||
|
||||
/*
|
|
@ -18,6 +18,7 @@
|
|||
+ bugfix/ia64/hardcode-arch-script-output.patch
|
||||
+ bugfix/mips/disable-advansys.patch
|
||||
+ bugfix/arm/disable-scsi_acard.patch
|
||||
+ bugfix/arm/ixp4xx-build-breakage.patch
|
||||
+ debian/mips-disable-werror.patch
|
||||
+ bugfix/powerpc/lpar-console.patch
|
||||
|
||||
|
|
Loading…
Reference in New Issue