From ef42472fdec00df81c5b2b398fa6f6d96706dc64 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Fri, 11 May 2007 16:18:55 -0700
Subject: [PATCH] --- yaml --- r: 57115 b: refs/heads/master c:
 b91d8a1205faa76affc4e1b7d5ccac1d17026970 h: refs/heads/master i:   57113:
 3e29f8479c141314955b451ad6292e4f9ca52390   57111:
 889990c195c0b79f2a4c35c825fe69f32d3acbac v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/kernel/armksyms.c  | 2 +-
 trunk/include/asm-arm/mach/arch.h | 2 +-
 trunk/include/asm-arm/setup.h     | 4 ++--
 trunk/include/asm-arm26/setup.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index dd07db30b8bb..4018ed03ad67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3abc12012f957d1c5b9f35b244256f88ad146564
+refs/heads/master: b91d8a1205faa76affc4e1b7d5ccac1d17026970
diff --git a/trunk/arch/arm/kernel/armksyms.c b/trunk/arch/arm/kernel/armksyms.c
index 9179e8220314..f73d62e8ab60 100644
--- a/trunk/arch/arm/kernel/armksyms.c
+++ b/trunk/arch/arm/kernel/armksyms.c
@@ -57,7 +57,7 @@ extern void fp_enter(void);
 #define EXPORT_SYMBOL_ALIAS(sym,orig)		\
  EXPORT_CRC_ALIAS(sym)				\
  static const struct kernel_symbol __ksymtab_##sym	\
-  __attribute_used__ __attribute__((section("__ksymtab"))) =	\
+  __used __attribute__((section("__ksymtab"))) =	\
     { (unsigned long)&orig, #sym };
 
 /*
diff --git a/trunk/include/asm-arm/mach/arch.h b/trunk/include/asm-arm/mach/arch.h
index fd2f9bf4dcc6..c59fad18e73b 100644
--- a/trunk/include/asm-arm/mach/arch.h
+++ b/trunk/include/asm-arm/mach/arch.h
@@ -49,7 +49,7 @@ struct machine_desc {
  */
 #define MACHINE_START(_type,_name)			\
 static const struct machine_desc __mach_desc_##_type	\
- __attribute_used__					\
+ __used							\
  __attribute__((__section__(".arch.info.init"))) = {	\
 	.nr		= MACH_TYPE_##_type,		\
 	.name		= _name,
diff --git a/trunk/include/asm-arm/setup.h b/trunk/include/asm-arm/setup.h
index e5407392afca..7bbf105463f1 100644
--- a/trunk/include/asm-arm/setup.h
+++ b/trunk/include/asm-arm/setup.h
@@ -185,7 +185,7 @@ struct tagtable {
 
 #ifdef __KERNEL__
 
-#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
+#define __tag __used __attribute__((__section__(".taglist.init")))
 #define __tagtable(tag, fn) \
 static struct tagtable __tagtable_##fn __tag = { tag, fn }
 
@@ -218,7 +218,7 @@ struct early_params {
 };
 
 #define __early_param(name,fn)					\
-static struct early_params __early_##fn __attribute_used__	\
+static struct early_params __early_##fn __used			\
 __attribute__((__section__(".early_param.init"))) = { name, fn }
 
 #endif  /*  __KERNEL__  */
diff --git a/trunk/include/asm-arm26/setup.h b/trunk/include/asm-arm26/setup.h
index 10fd07c76662..e82562306475 100644
--- a/trunk/include/asm-arm26/setup.h
+++ b/trunk/include/asm-arm26/setup.h
@@ -173,7 +173,7 @@ struct tagtable {
 	int (*parse)(const struct tag *);
 };
 
-#define __tag __attribute_used__ __attribute__((__section__(".taglist")))
+#define __tag __used __attribute__((__section__(".taglist")))
 #define __tagtable(tag, fn) \
 static struct tagtable __tagtable_##fn __tag = { tag, fn }