diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /arch/um/sys-x86_64/ksyms.c | |
parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'arch/um/sys-x86_64/ksyms.c')
-rw-r--r-- | arch/um/sys-x86_64/ksyms.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 4d7d1a812d8f..1db2fce00948 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c | |||
@@ -1,5 +1,11 @@ | |||
1 | #include "linux/module.h" | 1 | #include <linux/module.h> |
2 | #include "asm/string.h" | 2 | #include <asm/string.h> |
3 | #include <asm/checksum.h> | ||
3 | 4 | ||
4 | /*XXX: we need them because they would be exported by x86_64 */ | 5 | /*XXX: we need them because they would be exported by x86_64 */ |
6 | #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 | ||
7 | EXPORT_SYMBOL(memcpy); | ||
8 | #else | ||
5 | EXPORT_SYMBOL(__memcpy); | 9 | EXPORT_SYMBOL(__memcpy); |
10 | #endif | ||
11 | EXPORT_SYMBOL(csum_partial); | ||