Re: Linux 2.6.20.6

Chris Wright
2007-04-06T20:32:17Z

diff --git a/Makefile b/Makefile
index 3f194d1..e81e106 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 20
-EXTRAVERSION = .5
+EXTRAVERSION = .6
NAME = Homicidal Dwarf Hamster

# *DOCUMENTATION*
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index a664231..0f76175 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -91,7 +91,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
memcpy_dir(buf, vaddr, len_this_page, out);
scatterwalk_unmap(vaddr, out);

- scatterwalk_advance(walk, nbytes);
+ scatterwalk_advance(walk, len_this_page);

if (nbytes == len_this_page)
break;
diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
index b16222b..f5de80c 100644
--- a/include/asm-um/common.lds.S
+++ b/include/asm-um/common.lds.S
@@ -15,7 +15,7 @@
PROVIDE (_unprotected_end = .);

. = ALIGN(4096);
- .note : { *(note.*) }
+ .note : { *(.note.*) }
__start___ex_table = .;
__ex_table : { *(__ex_table) }
__stop___ex_table = .;