diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /arch/um/sys-x86_64/ksyms.c | |
| parent | af1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'arch/um/sys-x86_64/ksyms.c')
| -rw-r--r-- | arch/um/sys-x86_64/ksyms.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 6604673a849d..1db2fce00948 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c | |||
| @@ -3,5 +3,9 @@ | |||
| 3 | #include <asm/checksum.h> | 3 | #include <asm/checksum.h> |
| 4 | 4 | ||
| 5 | /*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 | ||
| 6 | EXPORT_SYMBOL(__memcpy); | 9 | EXPORT_SYMBOL(__memcpy); |
| 10 | #endif | ||
| 7 | EXPORT_SYMBOL(csum_partial); | 11 | EXPORT_SYMBOL(csum_partial); |