diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-01-08 16:08:14 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-08 16:08:14 +0000 |
| commit | 9f82556cbb90ca2ebdc3d0c68113c3ad4a09ef7a (patch) | |
| tree | 18c8c60a5122479559c541cb4edf0359b7b75c45 /packages/linux/nslu2-kernel | |
| parent | 18a1d5d645ec319bd93ceb684517125e085d9c52 (diff) | |
nslu2-kernel, nas100d-kernel: Updated patches with description from cvs repo.
Diffstat (limited to 'packages/linux/nslu2-kernel')
| -rw-r--r-- | packages/linux/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch | 23 | ||||
| -rw-r--r-- | packages/linux/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch | 7 |
2 files changed, 23 insertions, 7 deletions
diff --git a/packages/linux/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch b/packages/linux/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch index 4ec8f0475f..30d34952d5 100644 --- a/packages/linux/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch +++ b/packages/linux/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch @@ -1,3 +1,26 @@ +http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3218/1 + +PAGE_SHIFT is undeclared in include/asm-arm/arch-ixp4xx/memory.h, identified by the following kernel compilation error: + +CC [M] sound/core/memory.o +In file included from include/asm/memory.h:27, +from include/asm/io.h:28, +from sound/core/memory.c:24: +include/asm/arch/memory.h: In function `__arch_adjust_zones': +include/asm/arch/memory.h:28: error: `PAGE_SHIFT' undeclared (first use +in this function) + +This patch replaces my previous attempt at fixing this problem (Patch 3214/1) and is based on the following feedback: + +Russell King wrote: +> The error you see came up on SA1100. The best solution was to move +> the __arch_adjust_zones() function out of line. I suggest ixp4xx +> does the same. + +I have moved the function out of line into arch/arm/mach-ixp4xx/common-pci.c as suggested. + +Signed-off-by: Rod Whitby <rod@whitby.id.au> + --- linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/memory.h~ 2005-12-30 05:18:27.000000000 +1030 +++ linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/memory.h 2005-12-30 05:36:04.000000000 +1030 @@ -16,31 +16,10 @@ diff --git a/packages/linux/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch b/packages/linux/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch index 077aa00816..3fa0535abf 100644 --- a/packages/linux/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch +++ b/packages/linux/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch @@ -32,13 +32,6 @@ retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 -@@ -1,5 +1,5 @@ - /* -- * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $ -+ * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $ - * - * Parse RedBoot-style Flash Image System (FIS) tables and - * produce a Linux partition array to match. @@ -89,8 +89,32 @@ static int parse_redboot_partitions(stru i = numslots; break; |