Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-arm / setup.h

diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index dc58da8..ea3ed24 100644 (file)
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  *
  *  Structure passed to kernel to tell it about the
- *  hardware it's running on.  See linux/Documentation/arm/Setup
+ *  hardware it's running on.  See Documentation/arm/Setup
  *  for more info.
  */
 #ifndef __ASMARM_SETUP_H
@@ -171,7 +171,7 @@ struct tagtable {
        int (*parse)(const struct tag *);
 };
 
-#define __tag __attribute_used__ __attribute__((__section__(".taglist")))
+#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
 #define __tagtable(tag, fn) \
 static struct tagtable __tagtable_##fn __tag = { tag, fn }
 
@@ -203,8 +203,6 @@ struct meminfo {
        } bank[NR_BANKS];
 };
 
-extern struct meminfo meminfo;
-
 /*
  * Early command line parameters.
  */
@@ -215,6 +213,6 @@ struct early_params {
 
 #define __early_param(name,fn)                                 \
 static struct early_params __early_##fn __attribute_used__     \
-__attribute__((__section__("__early_param"))) = { name, fn }
+__attribute__((__section__(".early_param.init"))) = { name, fn }
 
 #endif