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

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
 

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

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 */

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>

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 */
 

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

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"
 
 

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

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
 

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

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