Commit d0025e5edf0e593da599358d70fdade47c3b703e

Authored by Mike Frysinger
Committed by Bryan Wu
1 parent e40540b304

Blackfin arch: move EXPORT_SYMBOL() to C files where the symbol is actually defined

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

Showing 6 changed files with 42 additions and 7 deletions Side-by-side Diff

arch/blackfin/kernel/bfin_ksyms.c
... ... @@ -37,8 +37,6 @@
37 37 /* platform dependent support */
38 38  
39 39 EXPORT_SYMBOL(__ioremap);
40   -EXPORT_SYMBOL(strcmp);
41   -EXPORT_SYMBOL(strncmp);
42 40  
43 41 EXPORT_SYMBOL(ip_fast_csum);
44 42  
... ... @@ -59,7 +57,6 @@
59 57 * their interface isn't gonna change any time soon now, so
60 58 * it's OK to leave it out of version control.
61 59 */
62   -EXPORT_SYMBOL(strcpy);
63 60 EXPORT_SYMBOL(memcpy);
64 61 EXPORT_SYMBOL(memset);
65 62 EXPORT_SYMBOL(memcmp);
arch/blackfin/lib/strcmp.c
1   -#include <linux/types.h>
  1 +/*
  2 + * Provide symbol in case str func is not inlined.
  3 + *
  4 + * Copyright (c) 2006-2007 Analog Devices Inc.
  5 + *
  6 + * Licensed under the GPL-2 or later.
  7 + */
2 8  
3 9 #define strcmp __inline_strcmp
4 10 #include <asm/string.h>
5 11 #undef strcmp
6 12  
  13 +#include <linux/module.h>
  14 +
7 15 int strcmp(const char *dest, const char *src)
8 16 {
9 17 return __inline_strcmp(dest, src);
10 18 }
  19 +EXPORT_SYMBOL(strcmp);
arch/blackfin/lib/strcpy.c
1   -#include <linux/types.h>
  1 +/*
  2 + * Provide symbol in case str func is not inlined.
  3 + *
  4 + * Copyright (c) 2006-2007 Analog Devices Inc.
  5 + *
  6 + * Licensed under the GPL-2 or later.
  7 + */
2 8  
3 9 #define strcpy __inline_strcpy
4 10 #include <asm/string.h>
5 11 #undef strcpy
6 12  
  13 +#include <linux/module.h>
  14 +
7 15 char *strcpy(char *dest, const char *src)
8 16 {
9 17 return __inline_strcpy(dest, src);
10 18 }
  19 +EXPORT_SYMBOL(strcpy);
arch/blackfin/lib/strncmp.c
1   -#include <linux/types.h>
  1 +/*
  2 + * Provide symbol in case str func is not inlined.
  3 + *
  4 + * Copyright (c) 2006-2007 Analog Devices Inc.
  5 + *
  6 + * Licensed under the GPL-2 or later.
  7 + */
2 8  
3 9 #define strncmp __inline_strncmp
4 10 #include <asm/string.h>
5 11 #undef strncmp
6 12  
  13 +#include <linux/module.h>
  14 +
7 15 int strncmp(const char *cs, const char *ct, size_t count)
8 16 {
9 17 return __inline_strncmp(cs, ct, count);
10 18 }
  19 +EXPORT_SYMBOL(strncmp);
arch/blackfin/lib/strncpy.c
1   -#include <linux/types.h>
  1 +/*
  2 + * Provide symbol in case str func is not inlined.
  3 + *
  4 + * Copyright (c) 2006-2007 Analog Devices Inc.
  5 + *
  6 + * Licensed under the GPL-2 or later.
  7 + */
2 8  
3 9 #define strncpy __inline_strncpy
4 10 #include <asm/string.h>
5 11 #undef strncpy
6 12  
  13 +#include <linux/module.h>
  14 +
7 15 char *strncpy(char *dest, const char *src, size_t n)
8 16 {
9 17 return __inline_strncpy(dest, src, n);
10 18 }
  19 +EXPORT_SYMBOL(strncpy);
include/asm-blackfin/string.h
1 1 #ifndef _BLACKFIN_STRING_H_
2 2 #define _BLACKFIN_STRING_H_
3 3  
  4 +#include <linux/types.h>
  5 +
4 6 #ifdef __KERNEL__ /* only set these up for kernel code */
5 7  
6 8 #define __HAVE_ARCH_STRCPY