diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 10:02:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 10:02:32 +0800 |
| commit | c577a32260e3c74bd2ccf42273c2f5cdf981b9a0 (patch) | |
| tree | 781fff52a3bb901f96a086ea788c08596ad396ce /arch/mips/kernel/mips_ksyms.c | |
| parent | e8f1cafd746408478934b9c8b9e9e0d5f450906c (diff) | |
| parent | 42f504e28a169ebfea0e3d9c6e151451800e41d5 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Most of cpu feature which hardcode in commit 3868e7f8d4799 are
included in compat_hwcap_str[]. We don't need repeat them.
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'arch/mips/kernel/mips_ksyms.c')
| -rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 6e58e97fcd39..cedeb5686eb5 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -14,6 +14,7 @@ #include <linux/mm.h> #include <asm/uaccess.h> #include <asm/ftrace.h> +#include <asm/fpu.h> extern void *__bzero(void *__s, size_t __count); extern long __strncpy_from_user_nocheck_asm(char *__to, @@ -26,6 +27,13 @@ extern long __strnlen_user_nocheck_asm(const char *s); extern long __strnlen_user_asm(const char *s); /* + * Core architecture code + */ +#ifdef CONFIG_CPU_R4K_FPU +EXPORT_SYMBOL_GPL(_save_fp); +#endif + +/* * String functions */ EXPORT_SYMBOL(memset); |