diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:27:13 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:27:13 +0800 |
| commit | b56111f481e16510558a892d5d56cb90cadd96c0 (patch) | |
| tree | bfca590ae8c2e8be7a7c44faba15ae3fd548f925 /arch/arm64/kernel | |
| parent | b8060c794f53e364a967ce483cef8e86f4006a61 (diff) | |
| parent | 59e65b4bbfe7d0139ab1ab59cd27a5db95f5bb7b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/arm64ksyms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c index 3b6d8cc9dfe0..c654df05b7d7 100644 --- a/arch/arm64/kernel/arm64ksyms.c +++ b/arch/arm64/kernel/arm64ksyms.c @@ -33,8 +33,8 @@ EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); /* user mem (segment) */ -EXPORT_SYMBOL(__copy_from_user); -EXPORT_SYMBOL(__copy_to_user); +EXPORT_SYMBOL(__arch_copy_from_user); +EXPORT_SYMBOL(__arch_copy_to_user); EXPORT_SYMBOL(__clear_user); EXPORT_SYMBOL(__copy_in_user); |