tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 39e01cb8 fb61a861

+13 -20
+7 -14
arch/ia64/Makefile
··· 82 82 archclean: 83 83 $(Q)$(MAKE) $(clean)=$(boot) 84 84 85 - CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader 86 - 87 - MRPROPER_FILES += include/asm-ia64/offsets.h 88 - 89 - prepare: include/asm-ia64/offsets.h 90 - 91 - arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER 92 - 93 - include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s 94 - $(call filechk,gen-asm-offsets) 95 - 96 - arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp 85 + prepare: include/asm-ia64/.offsets.h.stamp 97 86 98 87 include/asm-ia64/.offsets.h.stamp: 99 88 mkdir -p include/asm-ia64 100 - [ -s include/asm-ia64/offsets.h ] \ 101 - || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h 89 + [ -s include/asm-ia64/asm-offsets.h ] \ 90 + || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/asm-offsets.h 102 91 touch $@ 92 + 93 + 94 + 95 + CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp 103 96 104 97 boot: lib/lib.a vmlinux 105 98 $(Q)$(MAKE) $(build)=$(boot) $@
+1 -1
arch/ia64/ia32/ia32_entry.S
··· 1 1 #include <asm/asmmacro.h> 2 2 #include <asm/ia32.h> 3 - #include <asm/offsets.h> 3 + #include <asm/asm-offsets.h> 4 4 #include <asm/signal.h> 5 5 #include <asm/thread_info.h> 6 6
+1 -1
arch/ia64/kernel/entry.S
··· 37 37 #include <asm/cache.h> 38 38 #include <asm/errno.h> 39 39 #include <asm/kregs.h> 40 - #include <asm/offsets.h> 40 + #include <asm/asm-offsets.h> 41 41 #include <asm/pgtable.h> 42 42 #include <asm/percpu.h> 43 43 #include <asm/processor.h>
+1 -1
arch/ia64/kernel/fsys.S
··· 14 14 15 15 #include <asm/asmmacro.h> 16 16 #include <asm/errno.h> 17 - #include <asm/offsets.h> 17 + #include <asm/asm-offsets.h> 18 18 #include <asm/percpu.h> 19 19 #include <asm/thread_info.h> 20 20 #include <asm/sal.h>
+1 -1
arch/ia64/kernel/gate.S
··· 10 10 11 11 #include <asm/asmmacro.h> 12 12 #include <asm/errno.h> 13 - #include <asm/offsets.h> 13 + #include <asm/asm-offsets.h> 14 14 #include <asm/sigcontext.h> 15 15 #include <asm/system.h> 16 16 #include <asm/unistd.h>
+1 -1
arch/ia64/kernel/head.S
··· 25 25 #include <asm/fpu.h> 26 26 #include <asm/kregs.h> 27 27 #include <asm/mmu_context.h> 28 - #include <asm/offsets.h> 28 + #include <asm/asm-offsets.h> 29 29 #include <asm/pal.h> 30 30 #include <asm/pgtable.h> 31 31 #include <asm/processor.h>
+1 -1
arch/ia64/kernel/ivt.S
··· 44 44 #include <asm/break.h> 45 45 #include <asm/ia32.h> 46 46 #include <asm/kregs.h> 47 - #include <asm/offsets.h> 47 + #include <asm/asm-offsets.h> 48 48 #include <asm/pgtable.h> 49 49 #include <asm/processor.h> 50 50 #include <asm/ptrace.h>