aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 15:37:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 15:37:43 -0700
commit38400e42713de5f5d0d676eb721bc7f7237f7f18 (patch)
treea3231dad3ca043502a4649c4382088b21392178b /arch
parentb75cdf388ecdcd5ab5e66178f19c39a4c94dea26 (diff)
parentdeb75f3c29a13ac37a50d82a256c8dc17de58c3d (diff)
downloadkernel_samsung_smdk4412-38400e42713de5f5d0d676eb721bc7f7237f7f18.zip
kernel_samsung_smdk4412-38400e42713de5f5d0d676eb721bc7f7237f7f18.tar.gz
kernel_samsung_smdk4412-38400e42713de5f5d0d676eb721bc7f7237f7f18.tar.bz2
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch')
-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 70f8ed2..67932ad 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 f6a2342..7722565 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>