ar71xx: merge pci register read workaround from r24236

[openwrt-10.03/.git] / target / linux / ar71xx / patches-2.6.32 / 400-mips-multi-machine-update.patch

diff --git a/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
index 78646210ec46ec0d70640af442b07594f8110dad..d63587901d0c376e7d01f80b1aceb4b55f71a29f 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
@@ -86,9 +86,9 @@
 +}
 +
 +core_initcall(mips_machtype_init);
---- a/include/asm-mips/mips_machine.h
-+++ b/include/asm-mips/mips_machine.h
-@@ -13,24 +13,32 @@
+--- a/arch/mips/include/asm/mips_machine.h
++++ b/arch/mips/include/asm/mips_machine.h
+@@ -13,25 +13,33 @@
  #include <linux/init.h>
  #include <linux/list.h>
  
@@ -113,16 +113,22 @@
  
 -#define MIPS_MACHINE(_type, _name, _setup)                    \
 -static char machine_name_##_type[] __initdata = _name;                \
--static struct mips_machine machine_##_type __initdata =               \
 +#define MIPS_MACHINE(_type, _id, _name, _setup)               \
-+static char machine_name_##_type[] __initconst                        \
++static const char machine_name_##_type[] __initconst          \
 +                      __aligned(1) = _name;                   \
-+static char machine_id_##_type[] __initconst                  \
++static const char machine_id_##_type[] __initconst            \
 +                      __aligned(1) = _id;                     \
-+static struct mips_machine machine_##_type __initconst =      \
+ static struct mips_machine machine_##_type __initdata =               \
  {                                                             \
        .mach_type      = _type,                                \
-+      .mach_id        = machine_id_##_type,                   \
-       .mach_name      = machine_name_##_type,                 \
+-      .mach_name      = machine_name_##_type,                 \
++      .mach_id        = (char *) machine_id_##_type,          \
++      .mach_name      = (char *) machine_name_##_type,        \
        .mach_setup     = _setup,                               \
  };                                                            \
+                                                               \
+@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
+ pure_initcall(register_machine_##_type)
+ 
+ #endif /* __ASM_MIPS_MACHINE_H */
+-