diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 22:41:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 22:41:42 -0400 |
| commit | d5d42399bd7b66bd6b55363b311810504110c967 (patch) | |
| tree | bd676b8b8f2c85cecbe3777d7bb8c9a95e4cde98 /arch/x86/kernel | |
| parent | 209b6c8fa72e8b726a0cd273a56aded55be22bfa (diff) | |
| parent | 9599ec0471deae24044241e2173090d2cbc0e899 (diff) | |
Merge branch 'x86-mem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, mem: Convert memmove() to assembly file and fix return value bug
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/x8664_ksyms_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c index 1b950d151e58..9796c2f3d074 100644 --- a/arch/x86/kernel/x8664_ksyms_64.c +++ b/arch/x86/kernel/x8664_ksyms_64.c | |||
| @@ -52,6 +52,7 @@ extern void *__memcpy(void *, const void *, __kernel_size_t); | |||
| 52 | EXPORT_SYMBOL(memset); | 52 | EXPORT_SYMBOL(memset); |
| 53 | EXPORT_SYMBOL(memcpy); | 53 | EXPORT_SYMBOL(memcpy); |
| 54 | EXPORT_SYMBOL(__memcpy); | 54 | EXPORT_SYMBOL(__memcpy); |
| 55 | EXPORT_SYMBOL(memmove); | ||
| 55 | 56 | ||
| 56 | EXPORT_SYMBOL(empty_zero_page); | 57 | EXPORT_SYMBOL(empty_zero_page); |
| 57 | #ifndef CONFIG_PARAVIRT | 58 | #ifndef CONFIG_PARAVIRT |