Skip to content

Commit

Permalink
kbuild: ia64 use generic asm-offsets.h support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sam Ravnborg committed Sep 9, 2005
1 parent fb61a86 commit 39e01cb
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 20 deletions.
21 changes: 7 additions & 14 deletions arch/ia64/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,18 @@ unwcheck: vmlinux
archclean:
$(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:
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 $@



CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp

boot: lib/lib.a vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@

Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/ia32/ia32_entry.S
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <asm/asmmacro.h>
#include <asm/ia32.h>
#include <asm/offsets.h>
#include <asm/asm-offsets.h>
#include <asm/signal.h>
#include <asm/thread_info.h>

Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <asm/cache.h>
#include <asm/errno.h>
#include <asm/kregs.h>
#include <asm/offsets.h>
#include <asm/asm-offsets.h>
#include <asm/pgtable.h>
#include <asm/percpu.h>
#include <asm/processor.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/fsys.S
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <asm/asmmacro.h>
#include <asm/errno.h>
#include <asm/offsets.h>
#include <asm/asm-offsets.h>
#include <asm/percpu.h>
#include <asm/thread_info.h>
#include <asm/sal.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/gate.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <asm/asmmacro.h>
#include <asm/errno.h>
#include <asm/offsets.h>
#include <asm/asm-offsets.h>
#include <asm/sigcontext.h>
#include <asm/system.h>
#include <asm/unistd.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <asm/fpu.h>
#include <asm/kregs.h>
#include <asm/mmu_context.h>
#include <asm/offsets.h>
#include <asm/asm-offsets.h>
#include <asm/pal.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/ivt.S
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <asm/break.h>
#include <asm/ia32.h>
#include <asm/kregs.h>
#include <asm/offsets.h>
#include <asm/asm-offsets.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
Expand Down

0 comments on commit 39e01cb

Please sign in to comment.