Contents of /trunk/kernel26-magellan/patches-2.6.20-r5/0106-2.6.20.6-all-fixes.patch
Parent Directory | Revision Log
Revision 133 -
(show annotations)
(download)
Fri Apr 27 15:25:13 2007 UTC (17 years, 5 months ago) by niro
File size: 818 byte(s)
Fri Apr 27 15:25:13 2007 UTC (17 years, 5 months ago) by niro
File size: 818 byte(s)
files for 2.6.20-r5
1 | diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c |
2 | index a664231..0f76175 100644 |
3 | --- a/crypto/scatterwalk.c |
4 | +++ b/crypto/scatterwalk.c |
5 | @@ -91,7 +91,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk, |
6 | memcpy_dir(buf, vaddr, len_this_page, out); |
7 | scatterwalk_unmap(vaddr, out); |
8 | |
9 | - scatterwalk_advance(walk, nbytes); |
10 | + scatterwalk_advance(walk, len_this_page); |
11 | |
12 | if (nbytes == len_this_page) |
13 | break; |
14 | diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S |
15 | index b16222b..f5de80c 100644 |
16 | --- a/include/asm-um/common.lds.S |
17 | +++ b/include/asm-um/common.lds.S |
18 | @@ -15,7 +15,7 @@ |
19 | PROVIDE (_unprotected_end = .); |
20 | |
21 | . = ALIGN(4096); |
22 | - .note : { *(note.*) } |
23 | + .note : { *(.note.*) } |
24 | __start___ex_table = .; |
25 | __ex_table : { *(__ex_table) } |
26 | __stop___ex_table = .; |