diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
| commit | 661af35e5fd878f915ed05dbbfe383f64133f98c (patch) | |
| tree | 956b7efd662b682224e61060552fdcf4201101bf /arch/mips/kernel/mips_ksyms.c | |
| parent | ca5d25642e212f73492d332d95dc90ef46a0e8dc (diff) | |
| parent | f296e7c48d3155991b99f41372e1786c5be03457 (diff) | |
Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/mips_ksyms.c')
| -rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 1a73c6c9e4b7..291af0b5c482 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c | |||
| @@ -77,11 +77,13 @@ EXPORT_SYMBOL(__strnlen_kernel_asm); | |||
| 77 | EXPORT_SYMBOL(__strnlen_user_nocheck_asm); | 77 | EXPORT_SYMBOL(__strnlen_user_nocheck_asm); |
| 78 | EXPORT_SYMBOL(__strnlen_user_asm); | 78 | EXPORT_SYMBOL(__strnlen_user_asm); |
| 79 | 79 | ||
| 80 | #ifndef CONFIG_CPU_MIPSR6 | ||
| 80 | EXPORT_SYMBOL(csum_partial); | 81 | EXPORT_SYMBOL(csum_partial); |
| 81 | EXPORT_SYMBOL(csum_partial_copy_nocheck); | 82 | EXPORT_SYMBOL(csum_partial_copy_nocheck); |
| 82 | EXPORT_SYMBOL(__csum_partial_copy_kernel); | 83 | EXPORT_SYMBOL(__csum_partial_copy_kernel); |
| 83 | EXPORT_SYMBOL(__csum_partial_copy_to_user); | 84 | EXPORT_SYMBOL(__csum_partial_copy_to_user); |
| 84 | EXPORT_SYMBOL(__csum_partial_copy_from_user); | 85 | EXPORT_SYMBOL(__csum_partial_copy_from_user); |
| 86 | #endif | ||
| 85 | 87 | ||
| 86 | EXPORT_SYMBOL(invalid_pte_table); | 88 | EXPORT_SYMBOL(invalid_pte_table); |
| 87 | #ifdef CONFIG_FUNCTION_TRACER | 89 | #ifdef CONFIG_FUNCTION_TRACER |