git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
[sfrench/cifs-2.6.git]
/
arch
/
um
/
sys-i386
/
sys_call_table.S
diff --git
a/arch/um/sys-i386/sys_call_table.S
b/arch/um/sys-i386/sys_call_table.S
index 2497554b7b9547a7d176d658ae0f490d517d7144..00e5f5203eea337abd3a3e0ee115d6795ab0e4d3 100644
(file)
--- a/
arch/um/sys-i386/sys_call_table.S
+++ b/
arch/um/sys-i386/sys_call_table.S
@@
-9,4
+9,9
@@
#define old_mmap old_mmap_i386
-#include "../../i386/kernel/syscall_table.S"
+.section .rodata,"a"
+
+#include "../../x86/kernel/syscall_table_32.S"
+
+ENTRY(syscall_table_size)
+.long .-sys_call_table