Эх сурвалжийг харах

kbuild: ia64 use generic asm-offsets.h support

Delete obsolete stuff from arch Makefile
Rename file to asm-offsets.h
The trick used in the arch Makefile to circumvent the circular
dependency is kept.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Sam Ravnborg 19 жил өмнө
parent
commit
39e01cb874

+ 7 - 14
arch/ia64/Makefile

@@ -82,25 +82,18 @@ unwcheck: vmlinux
 archclean:
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
 	$(Q)$(MAKE) $(clean)=$(boot)
 
 
-CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
-
-MRPROPER_FILES += include/asm-ia64/offsets.h
-
-prepare: include/asm-ia64/offsets.h
-
-arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
-
-include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
-	$(call filechk,gen-asm-offsets)
-
-arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
+prepare:  include/asm-ia64/.offsets.h.stamp
 
 
 include/asm-ia64/.offsets.h.stamp:
 include/asm-ia64/.offsets.h.stamp:
 	mkdir -p include/asm-ia64
 	mkdir -p include/asm-ia64
-	[ -s include/asm-ia64/offsets.h ] \
-	 || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h
+	[ -s include/asm-ia64/asm-offsets.h ] \
+	|| echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/asm-offsets.h
 	touch $@
 	touch $@
 
 
+
+
+CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp
+
 boot:	lib/lib.a vmlinux
 boot:	lib/lib.a vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $@
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 

+ 1 - 1
arch/ia64/ia32/ia32_entry.S

@@ -1,6 +1,6 @@
 #include <asm/asmmacro.h>
 #include <asm/asmmacro.h>
 #include <asm/ia32.h>
 #include <asm/ia32.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/signal.h>
 #include <asm/signal.h>
 #include <asm/thread_info.h>
 #include <asm/thread_info.h>
 
 

+ 1 - 1
arch/ia64/kernel/entry.S

@@ -37,7 +37,7 @@
 #include <asm/cache.h>
 #include <asm/cache.h>
 #include <asm/errno.h>
 #include <asm/errno.h>
 #include <asm/kregs.h>
 #include <asm/kregs.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable.h>
 #include <asm/percpu.h>
 #include <asm/percpu.h>
 #include <asm/processor.h>
 #include <asm/processor.h>

+ 1 - 1
arch/ia64/kernel/fsys.S

@@ -14,7 +14,7 @@
 
 
 #include <asm/asmmacro.h>
 #include <asm/asmmacro.h>
 #include <asm/errno.h>
 #include <asm/errno.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/percpu.h>
 #include <asm/percpu.h>
 #include <asm/thread_info.h>
 #include <asm/thread_info.h>
 #include <asm/sal.h>
 #include <asm/sal.h>

+ 1 - 1
arch/ia64/kernel/gate.S

@@ -10,7 +10,7 @@
 
 
 #include <asm/asmmacro.h>
 #include <asm/asmmacro.h>
 #include <asm/errno.h>
 #include <asm/errno.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/sigcontext.h>
 #include <asm/sigcontext.h>
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
 #include <asm/unistd.h>

+ 1 - 1
arch/ia64/kernel/head.S

@@ -25,7 +25,7 @@
 #include <asm/fpu.h>
 #include <asm/fpu.h>
 #include <asm/kregs.h>
 #include <asm/kregs.h>
 #include <asm/mmu_context.h>
 #include <asm/mmu_context.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pal.h>
 #include <asm/pal.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/processor.h>

+ 1 - 1
arch/ia64/kernel/ivt.S

@@ -44,7 +44,7 @@
 #include <asm/break.h>
 #include <asm/break.h>
 #include <asm/ia32.h>
 #include <asm/ia32.h>
 #include <asm/kregs.h>
 #include <asm/kregs.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/ptrace.h>