summaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso2007-03-31 03:20:27 +0200
committerLinus Torvalds2007-03-31 04:21:30 +0200
commitc35e584c087381aaa5f1ed40a28b978535c18fb2 (patch)
tree3792eefee615bda5e97518c5769b2a1a5f3973ea /include/asm-um
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
downloadkernel-qcow2-linux-c35e584c087381aaa5f1ed40a28b978535c18fb2.tar.gz
kernel-qcow2-linux-c35e584c087381aaa5f1ed40a28b978535c18fb2.tar.xz
kernel-qcow2-linux-c35e584c087381aaa5f1ed40a28b978535c18fb2.zip
[PATCH] uml: fix static linking for real
There was a typo in commit 7632fc8f809a97f9d82ce125e8e3e579390ce2e5, preventing it from working - 32bit binaries crashed hopelessly before the below fix and work perfectly now. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-um')
-rw-r--r--include/asm-um/common.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
index b16222b42821..f5de80c31e88 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 = .;