aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-09-14 14:14:45 -0700
committerTony Luck <tony.luck@intel.com>2005-09-14 14:14:45 -0700
commitdeb75f3c29a13ac37a50d82a256c8dc17de58c3d (patch)
tree23282559a1d2d40464efaed0d98a96e269316d32 /arch/ia64
parentFix yenta error message when unable to find a bus assignment (diff)
parent[IA64] fix circular dependency on generation of asm-offsets.h (diff)
downloadlinux-dev-deb75f3c29a13ac37a50d82a256c8dc17de58c3d.tar.xz
linux-dev-deb75f3c29a13ac37a50d82a256c8dc17de58c3d.zip
Pull fix-offsets-h into release branch
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/Makefile12
-rw-r--r--arch/ia64/kernel/asm-offsets.c1
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 70f8ed2748d1..67932ad53082 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -82,17 +82,7 @@ unwcheck: vmlinux
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
-archprepare: include/asm-ia64/.offsets.h.stamp
-
-include/asm-ia64/.offsets.h.stamp:
- mkdir -p include/asm-ia64
- [ -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
+CLEAN_FILES += vmlinux.gz bootloader
boot: lib/lib.a vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index f6a234289341..77225659e968 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -4,6 +4,7 @@
* to extract and format the required data.
*/
+#define ASM_OFFSETS_C 1
#include <linux/config.h>
#include <linux/sched.h>