PPC32: Rename ppc_defs.h to asm-offsets.h to ease the transition to kbuild-2.5 later.

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index e2bb9d7c860b4e29f38725a074ae77ed59054c4b..5ff2dc352dcd011ccaa491ee121e5cb648eeb83d 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -111,7 +111,7 @@ $(BOOT_TARGETS): vmlinux
        cp -f arch/ppc/configs/$(@:config=defconfig) arch/ppc/defconfig
 
 archclean:
-       rm -f arch/ppc/kernel/{mk_defs,ppc_defs.h,find_name}
+       rm -f arch/ppc/kernel/{mk_defs,asm-offsets.h,find_name}
        rm -f arch/ppc/iSeries/ReleaseData.h
        @$(MAKEBOOT) clean
 

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index d2373a5850f5cf7b3f966321c11986c07d193942..ed1897f264b999a2e50fba942f24188d1a4c9081 100644 (file)
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -100,25 +100,22 @@ obj-$(CONFIG_PPC_ISERIES) += iSeries_misc.o
 
 include $(TOPDIR)/Rules.make
 
-entry.o: entry.S ppc_defs.h
-misc.o: misc.S ppc_defs.h
-l2cr.o: l2cr.S ppc_defs.h
-head.o: head.S ppc_defs.h
-head_4xx.o: head_4xx.S ppc_defs.h
-head_8xx.o: head_8xx.S ppc_defs.h
-iSeries_head.o: iSeries_head.S ppc_defs.h
-iSeries_misc.o: iSeries_misc.S ppc_defs.h
+entry.o: entry.S asm-offsets.h
+misc.o: misc.S asm-offsets.h
+l2cr.o: l2cr.S asm-offsets.h
+head.o: head.S asm-offsets.h
+head_4xx.o: head_4xx.S asm-offsets.h
+head_8xx.o: head_8xx.S asm-offsets.h
+iSeries_head.o: iSeries_head.S asm-offsets.h
+iSeries_misc.o: iSeries_misc.S asm-offsets.h
 
-ppc_defs.h: mk_defs.c ppc_defs.head \
+asm-offsets.h: mk_defs.c asm-offsets.head \
                $(TOPDIR)/include/asm/mmu.h \
                $(TOPDIR)/include/asm/processor.h \
                $(TOPDIR)/include/asm/pgtable.h \
                $(TOPDIR)/include/asm/ptrace.h
        $(CC) $(CFLAGS) -S mk_defs.c
-       cp ppc_defs.head ppc_defs.h
-# for bk, this way we can write to the file even if it's not checked out
-       chmod u+w ppc_defs.h
-       grep '^#define' mk_defs.s >> ppc_defs.h
+       (cat asm-offsets.head; grep '^#define' mk_defs.s) >asm-offsets.h
        rm mk_defs.s
 
 find_name : find_name.c

diff --git a/arch/ppc/kernel/asm-offsets.head b/arch/ppc/kernel/asm-offsets.head
new file mode 100644 (file)
index 0000000..fbe9264
--- /dev/null
+++ b/arch/ppc/kernel/asm-offsets.head
@@ -0,0 +1,3 @@
+/*
+ * WARNING! This file is automatically generated - DO NOT EDIT!
+ */

diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index e610ac65445db68c13b5b166aa10d127e2462168..8a5f264471610b38a99f8db14a487021de6ac65f 100644 (file)
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -33,7 +33,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 #ifdef CONFIG_PPC_ISERIES
 #include "iSeries_asm.h"
 #endif /* CONFIG_PPC_ISERIES */

diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index cb60c3343fed0c0cdf4e3a8d9d42528659eeab5d..f7b5aceec642b2a78338c35c26df6a9ff949f164 100644 (file)
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -34,7 +34,7 @@
 #include <asm/cache.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 
 #ifdef CONFIG_APUS
 #include <asm/amigappc.h>

diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S
index f7e8ded84d122cd0c5bb7d2788bae81347ff806e..6874d838a5032574c5f6840ef1b532361ac70f8c 100644 (file)
--- a/arch/ppc/kernel/head_4xx.S
+++ b/arch/ppc/kernel/head_4xx.S
@@ -40,7 +40,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 
 /* Preprocessor Defines */
 

diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index 8d9b0d851dc791758fd42c3960c9656e76452af3..62968fe86685cab6f466adefe3563ffd22d2d7e3 100644 (file)
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -33,7 +33,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 
        .text
        .globl  _stext

diff --git a/arch/ppc/kernel/iSeries_head.S b/arch/ppc/kernel/iSeries_head.S
index 21cccb15cb2aecb22a24b73111571436b314ca70..9981fc98fe2fc489ed704370d8fe545c4f4f6fb9 100644 (file)
--- a/arch/ppc/kernel/iSeries_head.S
+++ b/arch/ppc/kernel/iSeries_head.S
@@ -32,7 +32,7 @@
 #include <asm/pgtable.h>
 #include <asm/ppc_asm.h>
 #include <asm/thread_info.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 #include "iSeries_asm.h"
 
 

diff --git a/arch/ppc/kernel/iSeries_misc.S b/arch/ppc/kernel/iSeries_misc.S
index 357e75a35f9e6ebf3a61a155ab49d929130e5b34..dcaa807f74aa4cdaacbbd061c7446153ebdb9ed8 100644 (file)
--- a/arch/ppc/kernel/iSeries_misc.S
+++ b/arch/ppc/kernel/iSeries_misc.S
@@ -22,7 +22,7 @@
 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/ppc_asm.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 #include "iSeries_asm.h"
 
        .text

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 672ad51510399961f98ebcf293dca72c7557aaed..0c3e2bf13586a00ae5a647e018eaef488fc3010b 100644 (file)
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -26,7 +26,7 @@
 #include <asm/mmu.h>
 #include <asm/ppc_asm.h>
 #include <asm/thread_info.h>
-#include "ppc_defs.h"
+#include "asm-offsets.h"
 
        .text
 

diff --git a/arch/ppc/kernel/ppc_defs.head b/arch/ppc/kernel/ppc_defs.head
deleted file mode 100644 (file)
index fbe9264..0000000
--- a/arch/ppc/kernel/ppc_defs.head
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * WARNING! This file is automatically generated - DO NOT EDIT!
- */

diff --git a/arch/ppc/mm/Makefile b/arch/ppc/mm/Makefile
index bdc107709bd6093ccdd18baca346338a52c5c3da..055feba97948c40def627986306d584601989d0b 100644 (file)
--- a/arch/ppc/mm/Makefile
+++ b/arch/ppc/mm/Makefile
@@ -15,6 +15,8 @@ ifdef CONFIG_PPC64BRIDGE
 EXTRA_AFLAGS           := -Wa,-mppc64bridge
 endif
 
+AFLAGS_hashtable.o     += -I$(TOPDIR)/arch/$(ARCH)/kernel
+
 O_TARGET                       := mm.o
 obj-y                          := fault.o init.o mem_pieces.o extable.o \
                                        mmu_context.o pgtable.o

diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S
index 7ab04dab55a5eecd0e6eaf442732d04e318c6f18..ffaf4d1641bccb1ddcf58b9d113772764c9b60c1 100644 (file)
--- a/arch/ppc/mm/hashtable.S
+++ b/arch/ppc/mm/hashtable.S
@@ -33,7 +33,7 @@
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
 #include <asm/thread_info.h>
-#include <kernel/ppc_defs.h>
+#include "asm-offsets.h"
 
 #ifdef CONFIG_SMP
        .comm   mmu_hash_lock,4