[kernel] r13890 - in dists/trunk/linux-2.6/debian/patches: bugfix/all bugfix/arm series

[Martin Michlmayr]

Author: tbm
Date: Mon Jul  6 08:25:18 2009
New Revision: 13890

Log:
add mipsel and arm build fix

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/add-missing-mtd-include.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/export-flush_dcache_page.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/add-missing-mtd-include.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/add-missing-mtd-include.patch	Mon Jul  6 08:25:18 2009	(r13890)
@@ -0,0 +1,55 @@
+Hi Martin,
+
+Le Saturday 04 July 2009 23:37:41 Martin Michlmayr, vous avez écrit :
+> I get the following Cobalt build failure with current git:
+>
+>   CC      arch/mips/cobalt/mtd.o
+> cc1: warnings being treated as errors
+> In file included from arch/mips/cobalt/mtd.c:22:
+> include/linux/mtd/partitions.h:50: warning: ‘struct mtd_info’ declared
+> inside parameter list include/linux/mtd/partitions.h:50: warning: its scope
+> is only this definition or declaration, which is probably not what you want
+> include/linux/mtd/partitions.h:51: warning: ‘struct mtd_info’ declared
+> inside parameter list include/linux/mtd/partitions.h:61: warning: ‘struct
+> mtd_info’ declared inside parameter list include/linux/mtd/partitions.h:67:
+> warning: ‘struct mtd_info’ declared inside parameter list make[1]: ***
+> [arch/mips/cobalt/mtd.o] Error 1
+> make: *** [arch/mips/cobalt] Error 2
+>
+> Does anyone know if there's a fix for this already?
+
+I also had that problem and did the following fix, which still applies to
+the mtd-2.6 tree, master branch.
+--
+From: Florian Fainelli <florian at openwrt.org>
+Subject: [PATCH] Fix arch/mips/cobalt/mtd.c build failure
+
+This patch fixes a warning in include/linux/mtd/partitions which
+results in the following build failure on MIPS:
+ CC arch/mips/cobalt/mtd.o
+cc1: warnings being treated as errors
+In file included from arch/mips/cobalt/mtd.c:22:
+include/linux/mtd/partitions.h:50: warning: 'struct mtd_info' declared inside parameter list
+include/linux/mtd/partitions.h:50: warning: its scope is only this definition or declaration, which is probably not what you want
+include/linux/mtd/partitions.h:51: warning: 'struct mtd_info' declared inside parameter list
+include/linux/mtd/partitions.h:61: warning: 'struct mtd_info' declared inside parameter list
+include/linux/mtd/partitions.h:67: warning: 'struct mtd_info' declared inside parameter list
+make[1]: *** [arch/mips/cobalt/mtd.o] Error 1
+make: *** [arch/mips/cobalt] Error 2
+
+Reported-by: Martin Michlmayr <tbm at cyrius.com>
+Signed-off-by: Florian Fainelli <florian at openwrt.org>
+---
+diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
+index af6dcb9..c8eaf44 100644
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -10,7 +10,7 @@
+ #define MTD_PARTITIONS_H
+ 
+ #include <linux/types.h>
+-
++#include <linux/mtd/mtd.h>
+ 
+ /*
+  * Partition definition structure:

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/export-flush_dcache_page.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/export-flush_dcache_page.patch	Mon Jul  6 08:25:18 2009	(r13890)
@@ -0,0 +1,30 @@
+From: Russell King <rmk at dyn-67.arm.linux.org.uk>
+Date: Sun, 5 Jul 2009 09:50:37 +0000 (+0100)
+Subject: [ARM] export __cpu_flush_dcache_page
+X-Git-Url: http://ftp.arm.linux.org.uk/git/gitweb.cgi?p=linux-2.6-arm.git;a=commitdiff_plain;h=ba9b42e4ff5eb68f9c946378229d7e45299d7151
+
+[ARM] export __cpu_flush_dcache_page
+
+Now required for libsas:
+
+  Kernel: arch/arm/boot/Image is ready
+  Kernel: arch/arm/boot/zImage is ready
+  Building modules, stage 2.
+  MODPOST 1096 modules
+ERROR: "xscale_flush_kern_dcache_page" [drivers/scsi/libsas/libsas.ko] undefined!
+
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+---
+
+diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c
+index 195e48e..ac5c800 100644
+--- a/arch/arm/mm/proc-syms.c
++++ b/arch/arm/mm/proc-syms.c
+@@ -27,6 +27,7 @@ EXPORT_SYMBOL(__cpuc_flush_kern_all);
+ EXPORT_SYMBOL(__cpuc_flush_user_all);
+ EXPORT_SYMBOL(__cpuc_flush_user_range);
+ EXPORT_SYMBOL(__cpuc_coherent_kern_range);
++EXPORT_SYMBOL(__cpuc_flush_dcache_page);
+ EXPORT_SYMBOL(dmac_inv_range);  /* because of flush_ioremap_region() */
+ #else
+ EXPORT_SYMBOL(cpu_cache);

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Jul  6 08:02:16 2009	(r13889)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon Jul  6 08:25:18 2009	(r13890)
@@ -25,3 +25,5 @@
 #+ bugfix/all/wireless-regulatory-default-EU.patch
 #+ features/sparc/video-sunxvr500-intergraph.patch
 #+ bugfix/sparc/arch-zimage-target.patch
++ bugfix/arm/export-flush_dcache_page.patch
++ bugfix/all/add-missing-mtd-include.patch