diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-10-30 21:54:14 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-30 21:54:14 +0000 |
| commit | d1ebd904d77f4a8836b33317ebd02bada3d59d96 (patch) | |
| tree | e8a5d5821d04d1e3699ed33843cce0c9b93d9e26 /packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch | |
| parent | b7bf1357c5744791c1143ed7be283a6bf016c652 (diff) | |
nslu2-kernel: updated patch set and defconfig in 2.6.14
- 16-ixp4xx-ioremap is removed (l-a-k wants the warning in there)
- 25-nslu2-arch-reset is removed (doesn't seem necessary in 2.6.13+)
- 10-ixp4xx-copy-from update to remove compiler warning
- 18-ixp4xx-io-h-addr better patch - removes casts
- defconfig - update from CVS
- nslu2-kernel.inc: EXTRAVERSION and LOCALVERSION are now set to ""
- to ensure that KERNEL_VERSION is constant between major versions.
Diffstat (limited to 'packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch')
| -rw-r--r-- | packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch b/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch index f2e65ecd8f..66cf99b32e 100644 --- a/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch +++ b/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch @@ -1,5 +1,5 @@ ---- linux-2.6.13/.pc/10-ixp4xx-copy-from.patch/drivers/mtd/maps/ixp4xx.c 2005-10-07 15:55:08.958509801 -0700 -+++ linux-2.6.13/drivers/mtd/maps/ixp4xx.c 2005-10-07 19:06:22.352484966 -0700 +--- linux-2.6.14/drivers/mtd/maps/ixp4xx.c 2005-10-27 17:02:08.000000000 -0700 ++++ linux-2.6.14/drivers/mtd/maps/ixp4xx.c 2005-10-29 23:11:24.990820968 -0700 @@ -22,6 +22,7 @@ #include <linux/string.h> #include <linux/mtd/mtd.h> @@ -55,7 +55,7 @@ return val; } -@@ -53,19 +81,23 @@ +@@ -53,19 +81,25 @@ static map_word ixp4xx_read16(struct map static void ixp4xx_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) { @@ -63,15 +63,18 @@ - u8 *dest = (u8 *) to; - u16 *src = (u16 *) (map->map_priv_1 + from); - u16 data; -+ if (len <= 0) -+ return; - +- - for (i = 0; i < (len / 2); i++) { - data = src[i]; - dest[i * 2] = BYTE0(data); - dest[i * 2 + 1] = BYTE1(data); -+ u8 *dest = (u8 *) to; -+ u8 *src = (u8 *) (map->map_priv_1 + from); ++ u8 *dest, *src; ++ ++ if (len <= 0) ++ return; ++ ++ dest = (u8 *) to; ++ src = (u8 *) (map->map_priv_1 + from); + if (from & 1) + *dest++ = BYTE1(FLASHW(src-1)), ++src, --len; + @@ -89,7 +92,7 @@ } /* -@@ -75,7 +107,7 @@ +@@ -75,7 +109,7 @@ static void ixp4xx_copy_from(struct map_ static void ixp4xx_probe_write16(struct map_info *map, map_word d, unsigned long adr) { if (!(adr & 1)) @@ -98,7 +101,7 @@ } /* -@@ -83,7 +115,7 @@ +@@ -83,7 +117,7 @@ static void ixp4xx_probe_write16(struct */ static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr) { |