linux-next: Tree for March 30 (Blackfin string failures again)
Quoted 1 line · Stephen Rothwell
The rr tree lost 8 conflicts.
was the Blackfin changes related to the string updates lost or something ? the March 30 tree brought in these failures again ...
In file included from include/linux/bitmap.h:9,
from include/linux/nodemask.h:90,
from include/linux/mmzone.h:17,
from include/linux/gfp.h:5,
from include/linux/kmod.h:23,
from include/linux/module.h:14,
from arch/blackfin/lib/strncmp.c:14:include/linux/string.h: In function 'strstarts':include/linux/string.h:131: error: implicit declaration of function 'strncmp' make[1]: *** [arch/blackfin/lib/strncmp.o] Error 1
make: *** [arch/blackfin/lib] Error 2
Last committer:
cc11ee1: Stephen Rothwell <sfr@...>
Merge branch 'quilt/rr'
-mike
Quoted 5 lines · On Tuesday 31 March 2009 10:56:40 Mike Frysinger wrote:
Quoted 1 line · Stephen Rothwell
The rr tree lost 8 conflicts.
was the Blackfin changes related to the string updates lost or something ? the March 30 tree brought in these failures again ...
Sorry, you're right. I dropped all the arch-specific stuff, I should have kept that since it had your tested-by.
I'll send to Linus now.
Rusty.
PATCH 1/1 blackfin: allow allow usage of string functions in linux/string.h
In reply to Mike FrysingerIn introducing a trivial "strstarts()" function in linux/string.h, we hit the following error on blackfin:
file included from include/linux/bitmap.h:9,
from include/linux/nodemask.h:90,
from include/linux/mmzone.h:17,
from include/linux/gfp.h:5,
from include/linux/kmod.h:23,
from include/linux/module.h:14,
from arch/blackfin/lib/strncmp.c:14:include/linux/string.h: In function 'strstarts':include/linux/string.h:124: error: implicit declaration of function 'strncmp'
Because when including asm/string.h from arch/blackfin/lib/strncmp.c, we don't declare the string op we are about to define, and linux/string.h barfs.
The fix is to declare the function whose definition we steal via the #define trick. I do this for all of them, so this won't bite us in future.
--- arch/blackfin/lib/strcmp.c | 1 + arch/blackfin/lib/strcpy.c | 1 + arch/blackfin/lib/strncmp.c | 2 ++ arch/blackfin/lib/strncpy.c | 2 ++ 4 files changed, 6 insertions(+)
arch/blackfin/lib/strcmp.c +1 -0
@@ -6,6 +6,7 @@* Licensed under the GPL-2 or later. */ +int strcmp (const char *dest,const char *src);#define strcmp __inline_strcmp#include <asm/string.h> #undef strcmp
arch/blackfin/lib/strcpy.c +1 -0
@@ -6,6 +6,7 @@* Licensed under the GPL-2 or later. */ +char *strcpy (char *dest,const char *src);#define strcpy __inline_strcpy#include <asm/string.h> #undef strcpy
arch/blackfin/lib/strncmp.c +2 -0
@@ -6,6 +6,8 @@* Licensed under the GPL-2 or later. */ +#include <linux/types.h> +int strncmp (const char *cs,const char *ct,size_t count);#define strncmp __inline_strncmp#include <asm/string.h> #undef strncmp
arch/blackfin/lib/strncpy.c +2 -0
@@ -6,6 +6,8 @@* Licensed under the GPL-2 or later. */ +#include <linux/types.h> +char *strncpy (char *dest,const char *src,size_t n);#define strncpy __inline_strncpy#include <asm/string.h> #undef strncpy