[ARM] Don't include asm/elf.h in asm code
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 7 Sep 2008 18:15:31 +0000 (19:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Oct 2008 15:41:10 +0000 (16:41 +0100)
asm code really wants asm/hwcap.h, so include that instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
23 files changed:
arch/arm/include/asm/elf.h
arch/arm/mm/proc-arm1020.S
arch/arm/mm/proc-arm1020e.S
arch/arm/mm/proc-arm1022.S
arch/arm/mm/proc-arm1026.S
arch/arm/mm/proc-arm6_7.S
arch/arm/mm/proc-arm720.S
arch/arm/mm/proc-arm740.S
arch/arm/mm/proc-arm7tdmi.S
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-arm922.S
arch/arm/mm/proc-arm925.S
arch/arm/mm/proc-arm926.S
arch/arm/mm/proc-arm940.S
arch/arm/mm/proc-arm946.S
arch/arm/mm/proc-arm9tdmi.S
arch/arm/mm/proc-feroceon.S
arch/arm/mm/proc-sa110.S
arch/arm/mm/proc-sa1100.S
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S
arch/arm/mm/proc-xsc3.S
arch/arm/mm/proc-xscale.S

index 4ca7516274898dafae96518f76a4f6656a352264..7ea302c14a5909a8cc3b29161d03b20677fc6bc9 100644 (file)
@@ -3,7 +3,6 @@
 
 #include <asm/hwcap.h>
 
-#ifndef __ASSEMBLY__
 /*
  * ELF register definitions..
  */
@@ -17,7 +16,6 @@ typedef unsigned long elf_freg_t[3];
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_fp elf_fpregset_t;
-#endif
 
 #define EM_ARM 40
 #define EF_ARM_APCS26 0x08
@@ -41,7 +39,6 @@ typedef struct user_fp elf_fpregset_t;
 #endif
 #define ELF_ARCH       EM_ARM
 
-#ifndef __ASSEMBLY__
 /*
  * This yields a string that ld.so will use to load implementation
  * specific libraries for optimization.  This is more specific in
@@ -59,7 +56,6 @@ typedef struct user_fp elf_fpregset_t;
 #define ELF_PLATFORM   (elf_platform)
 
 extern char elf_platform[];
-#endif
 
 /*
  * This is used to ensure we don't load something for the wrong architecture.
index 453f828f1fbb8b9377512f855bf9924a7a8d1ab2..b5551bf010aa33668d938e09d184d3df2bc1ec5d 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index a226dd330c2d1bcd978d392829fac1c33619aa12..8bc6740c29eb68d8bcfdb97111281ecca87e0f41 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 68db8c5a4e98609b7964c04e5321fbccf26f275d..2cd03e66c0a318f9b28c14bdf0749571604de303 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index c02f303d3add506ab43cafa254c8ac70fb853b13..ad961a897f6eae5cfad3d3bee1fc6fcd0d8d865f 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 5e78c483e48ac0ef57cc89807df8ec6703538143..80d6e1de069ada45c74cf6b665b91292d5990019 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 6d3e0620be71e0cb598dd921c441c4aeed75897e..85ae18695f1021a4cf2299fbcad8f382b9f7c03d 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 3a57376c8bc970f71a1673dd636b8462d3724a79..4f95bee63e95c0454cc1fc9224a686316db37368 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 7b3ecdeb537003a9e2dd183f0f45f31b0e767b09..93e05fa7bed44933341d6d4c42db7655b6fafb15 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 260595bc912bcfa7748f8fab436dffd731acea5b..914d688394fc150f26c9e4987542dae74a24205a 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
index 0428f77b0d725c0e1bd28222f1e6fe8e1a8a1feb..51c9c9859e58475232851e89c7fa032af52d72ad 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
index 30194781fd0123d436e192118ccd2dbb9bdc797a..2724526d89c1ccb302055ebf0ef52378497189bc 100644 (file)
@@ -52,7 +52,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
index 10e6ac257892ac39d5cb656885dc2a8146a7e616..54466937bff994ea288ba5ece9c7c39ddacecbd8 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
index 551244d5ca19eb1a20bfde7a5661606aff9cfbec..f595117caf55bb7db716b29e477c7c0f9f49bb95 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 6168c6160deef1d5ed2506e7cabe385d4b90c406..e03f6ff1fb2631284176fd5cc08c164f592a6f4d 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index c85c1f50e396ef1d82e6ba6f7ef736ddbd3f22d8..be6c11d2b3fbf10092be644df37aba7787387004 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 240366ee81e82a40514c7fdff2ccb0c555b43998..2b8bb383755e66a6cfdbbabebcd1a7b757e6b7fe 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
index df3aebbb55d06595ee4036f79278499f98787e1b..90a7e5279f296c1193cc0a389c9b9d8b1f272186 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <mach/hardware.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
index 8e85e7cbc82f1f5c45b1e77775f2a025d810e47f..451e2d953e2a0389ed462b253ca904053b2b24ff 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <mach/hardware.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
index ab457757e8518e7000ef3bbdac3df4b3cf43b812..294943b85973c3df54341885cba4d2470d1af2bc 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 
index 18897fbbe8bf1a6036df50346e7be79b1426932d..db83c98b6b1fa2b4f9e189f3796c51cdbe199503 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 
index ecdd944bc2b9e1c39a44e3da37e9fbbd6e9bdd79..04dc8b65401b4890b6ebc67eaac43f2c11d09169 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
index 01adbd9462f864f0ceea4b3e5eba3206c398317a..0cce37b9393730b43b8adcf2a37ed9e2ee2f5bcd 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/page.h>