The patch titled
cpm_load_patch() - declartion conflict
has been added to the -mm tree. Its filename is
cpm_load_patch-declartion-conflict.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cpm_load_patch() - declartion conflict
From: Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx>
The build fails with following error
CC arch/powerpc/sysdev/micropatch.o
arch/powerpc/sysdev/micropatch.c:625: error: conflicting types for `cpm_load_patch'
include/asm/commproc.h:94: error: previous declaration of `cpm_load_patch' was here
arch/powerpc/sysdev/micropatch.c: In function `cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:630: warning: unused variable `smp'
arch/powerpc/sysdev/micropatch.c:629: warning: unused variable `spp'
arch/powerpc/sysdev/micropatch.c:628: warning: unused variable `iip'
make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
make: *** [arch/powerpc/sysdev] Error 2
The commit f2a0bd3753dad7ea4605ebd5435716b39e9f92bb defines the function
with void cpm_load_patch(cpm8xx_t *cp) prtotype and is declared as
extern void cpm_load_patch(volatile immap_t *immr) in the header file.
Signed-off-by: Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-powerpc/commproc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/asm-powerpc/commproc.h~cpm_load_patch-declartion-conflict include/asm-powerpc/commproc.h
--- a/include/asm-powerpc/commproc.h~cpm_load_patch-declartion-conflict
+++ a/include/asm-powerpc/commproc.h
@@ -91,7 +91,7 @@ extern uint m8xx_cpm_hostalloc(uint size
extern int m8xx_cpm_hostfree(uint start);
extern void m8xx_cpm_hostdump(void);
-extern void cpm_load_patch(volatile immap_t *immr);
+extern void cpm_load_patch(cpm8xx_t *cp);
/* Buffer descriptors used by many of the CPM protocols.
*/
_
Patches currently in -mm which might be from kamalesh@xxxxxxxxxxxxxxxxxx are
missing-include-file-in-kallsymsh.patch
cpm_load_patch-declartion-conflict.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
