diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
commit | e8f9b6396e79654ea5932f64131cafbe8caadfb1 (patch) | |
tree | 90cf8b3a2475a774369eda22247cab7874fd7bbf /arch/ia64/tools | |
parent | d4c419dfaa853f5db107973976d4215ae648e976 (diff) |
Merge with Linux 2.4.0-test5-pre2.
Diffstat (limited to 'arch/ia64/tools')
-rw-r--r-- | arch/ia64/tools/Makefile | 8 | ||||
-rw-r--r-- | arch/ia64/tools/print_offsets.awk | 5 | ||||
-rw-r--r-- | arch/ia64/tools/print_offsets.c | 12 |
3 files changed, 15 insertions, 10 deletions
diff --git a/arch/ia64/tools/Makefile b/arch/ia64/tools/Makefile index b3d2e74b9..0e6d78450 100644 --- a/arch/ia64/tools/Makefile +++ b/arch/ia64/tools/Makefile @@ -11,10 +11,10 @@ clean: fastdep: offsets.h @if ! cmp -s offsets.h ${TARGET}; then \ - echo "Updating ${TARGET}..."; \ + echo -e "*** Updating ${TARGET}..."; \ cp offsets.h ${TARGET}; \ else \ - echo "${TARGET} is up to date"; \ + echo "*** ${TARGET} is up to date"; \ fi # @@ -31,9 +31,11 @@ ifeq ($(CROSS_COMPILE),) offsets.h: print_offsets ./print_offsets > offsets.h -print_offsets: print_offsets.c +print_offsets: print_offsets.c FORCE_RECOMPILE $(CC) $(CFLAGS) print_offsets.c -o $@ +FORCE_RECOMPILE: + else offsets.h: print_offsets.s diff --git a/arch/ia64/tools/print_offsets.awk b/arch/ia64/tools/print_offsets.awk index 5eb8bcb63..63136aa3a 100644 --- a/arch/ia64/tools/print_offsets.awk +++ b/arch/ia64/tools/print_offsets.awk @@ -9,9 +9,10 @@ BEGIN { print " */" # # This is a cheesy hack. Make sure that - # PF_PTRACED == 1<<PF_PTRACED_BIT. + # PT_PTRACED == 1<<PT_PTRACED_BIT. # - print "#define PF_PTRACED_BIT 4" + print "#define PT_PTRACED_BIT 0" + print "#define PT_TRACESYS_BIT 1" } # look for .tab: diff --git a/arch/ia64/tools/print_offsets.c b/arch/ia64/tools/print_offsets.c index d7d7e3e6f..3a7259b09 100644 --- a/arch/ia64/tools/print_offsets.c +++ b/arch/ia64/tools/print_offsets.c @@ -49,7 +49,7 @@ tab[] = { "UNW_FRAME_INFO_SIZE", sizeof (struct unw_frame_info) }, #endif { "", 0 }, /* spacer */ - { "IA64_TASK_FLAGS_OFFSET", offsetof (struct task_struct, flags) }, + { "IA64_TASK_PTRACE_OFFSET", offsetof (struct task_struct, ptrace) }, { "IA64_TASK_SIGPENDING_OFFSET", offsetof (struct task_struct, sigpending) }, { "IA64_TASK_NEED_RESCHED_OFFSET", offsetof (struct task_struct, need_resched) }, { "IA64_TASK_PROCESSOR_OFFSET", offsetof (struct task_struct, processor) }, @@ -175,10 +175,12 @@ main (int argc, char **argv) "arch/ia64/tools/print_offsets.\n *\n */\n\n"); /* This is stretching things a bit, but entry.S needs the bit number - for PF_PTRACED and it can't include <linux/sched.h> so this seems - like a reasonably solution. At least the code won't break shoudl - PF_PTRACED ever change. */ - printf ("#define PF_PTRACED_BIT\t\t\t%u\n\n", ffs (PF_PTRACED) - 1); + for PT_PTRACED and it can't include <linux/sched.h> so this seems + like a reasonably solution. At least the code won't break in + subtle ways should PT_PTRACED ever change. Ditto for + PT_TRACESYS_BIT. */ + printf ("#define PT_PTRACED_BIT\t\t\t%u\n", ffs (PT_PTRACED) - 1); + printf ("#define PT_TRACESYS_BIT\t\t\t%u\n\n", ffs (PT_TRACESYS) - 1); for (i = 0; i < sizeof (tab) / sizeof (tab[0]); ++i) { |