Re: [PATCH 01/22] 2.6.22-rc3 perfmon2: arch-specific infrastructurechanges

From: David Rientjes
Date: Mon Jun 04 2007 - 10:45:58 EST

On Tue, 29 May 2007, Stephane Eranian wrote:

> This patch contains the remaining infrastructure changes required
> for perfmon2 for all architectures. It is expected that this patch
> will be obsolete by 2.6.23.
>
> all arch:
> - remove unused TIF_NOTIFY_RESUME (already in -mm)
>
> mips:
> - add smp_call_function_single()
>
>
>
>
>
> diff -urNp --exclude=.git linux-2.6.22.orig/arch/arm/kernel/entry-common.S linux-2.6.22.base/arch/arm/kernel/entry-common.S
> --- linux-2.6.22.orig/arch/arm/kernel/entry-common.S 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/arch/arm/kernel/entry-common.S 2007-05-29 03:20:21.000000000 -0700
> @@ -46,7 +46,7 @@ fast_work_pending:
> work_pending:
> tst r1, #_TIF_NEED_RESCHED
> bne work_resched
> - tst r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING
> + tst r1, #_TIF_SIGPENDING
> beq no_work_pending
> mov r0, sp @ 'regs'
> mov r2, why @ 'syscall'
> diff -urNp --exclude=.git linux-2.6.22.orig/arch/arm26/kernel/entry.S linux-2.6.22.base/arch/arm26/kernel/entry.S
> --- linux-2.6.22.orig/arch/arm26/kernel/entry.S 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/arch/arm26/kernel/entry.S 2007-05-29 03:20:21.000000000 -0700
> @@ -194,7 +194,7 @@ fast_work_pending:
> work_pending:
> tst r1, #_TIF_NEED_RESCHED
> bne work_resched
> - tst r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING
> + tst r1, #_TIF_SIGPENDING
> beq no_work_pending
> mov r0, sp @ 'regs'
> mov r2, why @ 'syscall'
> diff -urNp --exclude=.git linux-2.6.22.orig/arch/ia64/kernel/perfmon.c linux-2.6.22.base/arch/ia64/kernel/perfmon.c
> --- linux-2.6.22.orig/arch/ia64/kernel/perfmon.c 2007-05-29 03:16:09.000000000 -0700
> +++ linux-2.6.22.base/arch/ia64/kernel/perfmon.c 2007-05-29 03:20:21.000000000 -0700
> @@ -591,13 +591,13 @@ pfm_set_task_notify(struct task_struct *
> struct thread_info *info;
>
> info = (struct thread_info *) ((char *) task + IA64_TASK_SIZE);
> - set_bit(TIF_NOTIFY_RESUME, &info->flags);
> + set_bit(TIF_PERFMON_WORK, &info->flags);
> }
>
> static inline void
> pfm_clear_task_notify(void)
> {
> - clear_thread_flag(TIF_NOTIFY_RESUME);
> + clear_thread_flag(TIF_PERFMON_WORK);
> }
>
> static inline void
> diff -urNp --exclude=.git linux-2.6.22.orig/arch/mips/kernel/smp.c linux-2.6.22.base/arch/mips/kernel/smp.c
> --- linux-2.6.22.orig/arch/mips/kernel/smp.c 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/arch/mips/kernel/smp.c 2007-05-29 03:20:21.000000000 -0700
> @@ -203,6 +203,52 @@ void smp_call_function_interrupt(void)
> }
> }
>
> +int smp_call_function_single (int cpu, void (*func) (void *info), void *info, int retry,
> + int wait)
> +{
> + struct call_data_struct data;
> + int me = smp_processor_id();
> +
> + /*
> + * Can die spectacularly if this CPU isn't yet marked online
> + */
> + BUG_ON(!cpu_online(me));
> + if (cpu == me) {
> + WARN_ON(1);
> + return -EBUSY;
> + }
> +
> + /* Can deadlock when called with interrupts disabled */
> + WARN_ON(irqs_disabled());
> +
> + data.func = func;
> + data.info = info;
> + atomic_set(&data.started, 0);
> + data.wait = wait;
> + if (wait)
> + atomic_set(&data.finished, 0);
> +
> + spin_lock(&smp_call_lock);
> + call_data = &data;
> + mb();
> +
> + /* Send a message to the other CPU */
> + core_send_ipi(cpu, SMP_CALL_FUNCTION);
> +
> + /* Wait for response */
> + /* FIXME: lock-up detection, backtrace on lock-up */
> + while (atomic_read(&data.started) != 1)
> + barrier();
> +
> + if (wait)
> + while (atomic_read(&data.finished) != 1)
> + barrier();
> + call_data = NULL;
> + spin_unlock(&smp_call_lock);
> +
> + return 0;
> +}

Needs EXPORT_SYMBOL(smp_call_function_single).

> +
> static void stop_this_cpu(void *dummy)
> {
> /*
> diff -urNp --exclude=.git linux-2.6.22.orig/arch/powerpc/kernel/entry_64.S linux-2.6.22.base/arch/powerpc/kernel/entry_64.S
> --- linux-2.6.22.orig/arch/powerpc/kernel/entry_64.S 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/arch/powerpc/kernel/entry_64.S 2007-05-29 03:20:21.000000000 -0700
> @@ -546,7 +546,6 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
> rfid
> b . /* prevent speculative execution */
>
> -/* Note: this must change if we start using the TIF_NOTIFY_RESUME bit */
> do_work:
> #ifdef CONFIG_PREEMPT
> andi. r0,r3,MSR_PR /* Returning to user mode? */
> diff -urNp --exclude=.git linux-2.6.22.orig/arch/x86_64/kernel/entry.S linux-2.6.22.base/arch/x86_64/kernel/entry.S
> --- linux-2.6.22.orig/arch/x86_64/kernel/entry.S 2007-05-29 03:16:09.000000000 -0700
> +++ linux-2.6.22.base/arch/x86_64/kernel/entry.S 2007-05-29 03:20:21.000000000 -0700
> @@ -282,7 +282,7 @@ sysret_careful:
> sysret_signal:
> TRACE_IRQS_ON
> sti
> - testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP),%edx
> + testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP),%edx
> jz 1f
>
> /* Really a signal */
> @@ -375,7 +375,7 @@ int_very_careful:
> jmp int_restore_rest
>
> int_signal:
> - testl $(_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_SINGLESTEP),%edx
> + testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP),%edx
> jz 1f
> movq %rsp,%rdi # &ptregs -> arg1
> xorl %esi,%esi # oldset -> arg2
> @@ -599,7 +599,7 @@ retint_careful:
> jmp retint_check
>
> retint_signal:
> - testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP),%edx
> + testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP),%edx
> jz retint_swapgs
> TRACE_IRQS_ON
> sti
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-alpha/thread_info.h linux-2.6.22.base/include/asm-alpha/thread_info.h
> --- linux-2.6.22.orig/include/asm-alpha/thread_info.h 2007-05-29 03:16:27.000000000 -0700
> +++ linux-2.6.22.base/include/asm-alpha/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -67,25 +67,22 @@ register struct thread_info *__current_t
> * TIF_SYSCALL_TRACE is known to be 0 via blbs.
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> -#define TIF_POLLING_NRFLAG 4 /* poll_idle is polling NEED_RESCHED */
> -#define TIF_DIE_IF_KERNEL 5 /* dik recursion lock */
> -#define TIF_UAC_NOPRINT 6 /* see sysinfo.h */
> -#define TIF_UAC_NOFIX 7
> -#define TIF_UAC_SIGBUS 8
> -#define TIF_MEMDIE 9
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> +#define TIF_POLLING_NRFLAG 3 /* poll_idle is polling NEED_RESCHED */
> +#define TIF_DIE_IF_KERNEL 4 /* dik recursion lock */
> +#define TIF_UAC_NOPRINT 5 /* see sysinfo.h */
> +#define TIF_UAC_NOFIX 6
> +#define TIF_UAC_SIGBUS 7
> +#define TIF_MEMDIE 8
>
> #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
> #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
>
> /* Work to do on interrupt/exception return. */
> -#define _TIF_WORK_MASK (_TIF_NOTIFY_RESUME \
> - | _TIF_SIGPENDING \
> +#define _TIF_WORK_MASK (_TIF_SIGPENDING \
> | _TIF_NEED_RESCHED)
>
> /* Work to do on any return to userspace. */
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-arm/thread_info.h linux-2.6.22.base/include/asm-arm/thread_info.h
> --- linux-2.6.22.orig/include/asm-arm/thread_info.h 2007-05-29 03:16:27.000000000 -0700
> +++ linux-2.6.22.base/include/asm-arm/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -135,22 +135,19 @@ extern void iwmmxt_task_switch(struct th
> /*
> * thread information flags:
> * TIF_SYSCALL_TRACE - syscall trace active
> - * TIF_NOTIFY_RESUME - resumption notification requested
> * TIF_SIGPENDING - signal pending
> * TIF_NEED_RESCHED - rescheduling necessary
> * TIF_USEDFPU - FPU was used by this task this quantum (SMP)
> * TIF_POLLING_NRFLAG - true if poll_idle() is polling TIF_NEED_RESCHED
> */
> -#define TIF_NOTIFY_RESUME 0
> -#define TIF_SIGPENDING 1
> -#define TIF_NEED_RESCHED 2
> +#define TIF_SIGPENDING 0
> +#define TIF_NEED_RESCHED 1
> #define TIF_SYSCALL_TRACE 8
> #define TIF_POLLING_NRFLAG 16
> #define TIF_USING_IWMMXT 17
> #define TIF_MEMDIE 18
> #define TIF_FREEZE 19
>
> -#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
> #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-arm26/thread_info.h linux-2.6.22.base/include/asm-arm26/thread_info.h
> --- linux-2.6.22.orig/include/asm-arm26/thread_info.h 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/include/asm-arm26/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -110,21 +110,18 @@ extern void free_thread_info(struct thre
> /*
> * thread information flags:
> * TIF_SYSCALL_TRACE - syscall trace active
> - * TIF_NOTIFY_RESUME - resumption notification requested
> * TIF_SIGPENDING - signal pending
> * TIF_NEED_RESCHED - rescheduling necessary
> * TIF_USEDFPU - FPU was used by this task this quantum (SMP)
> * TIF_POLLING_NRFLAG - true if poll_idle() is polling TIF_NEED_RESCHED
> */
> -#define TIF_NOTIFY_RESUME 0
> -#define TIF_SIGPENDING 1
> -#define TIF_NEED_RESCHED 2
> +#define TIF_SIGPENDING 0
> +#define TIF_NEED_RESCHED 1
> #define TIF_SYSCALL_TRACE 8
> #define TIF_USED_FPU 16
> #define TIF_POLLING_NRFLAG 17
> #define TIF_MEMDIE 18
>
> -#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
> #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-avr32/thread_info.h linux-2.6.22.base/include/asm-avr32/thread_info.h
> --- linux-2.6.22.orig/include/asm-avr32/thread_info.h 2007-05-29 03:16:27.000000000 -0700
> +++ linux-2.6.22.base/include/asm-avr32/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -74,20 +74,18 @@ static inline struct thread_info *curren
> * - other flags in MSW
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> -#define TIF_POLLING_NRFLAG 4 /* true if poll_idle() is polling
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> +#define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
> TIF_NEED_RESCHED */
> -#define TIF_BREAKPOINT 5 /* true if we should break after return */
> -#define TIF_SINGLE_STEP 6 /* single step after next break */
> -#define TIF_MEMDIE 7
> -#define TIF_RESTORE_SIGMASK 8 /* restore signal mask in do_signal */
> -#define TIF_CPU_GOING_TO_SLEEP 9 /* CPU is entering sleep 0 mode */
> +#define TIF_BREAKPOINT 4 /* true if we should break after return */
> +#define TIF_SINGLE_STEP 5 /* single step after next break */
> +#define TIF_MEMDIE 6
> +#define TIF_RESTORE_SIGMASK 7 /* restore signal mask in do_signal */
> +#define TIF_CPU_GOING_TO_SLEEP 8 /* CPU is entering sleep 0 mode */
> #define TIF_USERSPACE 31 /* true if FS sets userspace */
>
> #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
> #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-blackfin/thread_info.h linux-2.6.22.base/include/asm-blackfin/thread_info.h
> --- linux-2.6.22.orig/include/asm-blackfin/thread_info.h 2007-05-29 03:16:27.000000000 -0700
> +++ linux-2.6.22.base/include/asm-blackfin/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -118,18 +118,16 @@ static inline struct thread_info *curren
> * thread information flag bit numbers
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> -#define TIF_POLLING_NRFLAG 4 /* true if poll_idle() is polling
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> +#define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
> TIF_NEED_RESCHED */
> -#define TIF_MEMDIE 5
> -#define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */
> -#define TIF_FREEZE 7 /* is freezing for suspend */
> +#define TIF_MEMDIE 4
> +#define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */
> +#define TIF_FREEZE 6 /* is freezing for suspend */
>
> /* as above, but as bit values */
> #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
> #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-cris/thread_info.h linux-2.6.22.base/include/asm-cris/thread_info.h
> --- linux-2.6.22.orig/include/asm-cris/thread_info.h 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/include/asm-cris/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -79,14 +79,12 @@ struct thread_info {
> * - other flags in MSW
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */
> #define TIF_MEMDIE 17
>
> #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
> #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-frv/thread_info.h linux-2.6.22.base/include/asm-frv/thread_info.h
> --- linux-2.6.22.orig/include/asm-frv/thread_info.h 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/include/asm-frv/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -108,18 +108,16 @@ register struct thread_info *__current_t
> * - other flags in MSW
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> -#define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */
> -#define TIF_IRET 5 /* return with iret */
> -#define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> +#define TIF_SINGLESTEP 3 /* restore singlestep on return to user mode */
> +#define TIF_IRET 4 /* return with iret */
> +#define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */
> #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */
> #define TIF_MEMDIE 17 /* OOM killer killed process */
> #define TIF_FREEZE 18 /* freezing for suspend */
>
> #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
> #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-h8300/thread_info.h linux-2.6.22.base/include/asm-h8300/thread_info.h
> --- linux-2.6.22.orig/include/asm-h8300/thread_info.h 2007-04-25 20:08:32.000000000 -0700
> +++ linux-2.6.22.base/include/asm-h8300/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -86,16 +86,14 @@ static inline struct thread_info *curren
> * thread information flag bit numbers
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> -#define TIF_POLLING_NRFLAG 4 /* true if poll_idle() is polling
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> +#define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
> TIF_NEED_RESCHED */
> -#define TIF_MEMDIE 5
> +#define TIF_MEMDIE 4
>
> /* as above, but as bit values */
> #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
> #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-i386/thread_info.h linux-2.6.22.base/include/asm-i386/thread_info.h
> --- linux-2.6.22.orig/include/asm-i386/thread_info.h 2007-05-29 03:16:27.000000000 -0700
> +++ linux-2.6.22.base/include/asm-i386/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -124,22 +124,20 @@ static inline struct thread_info *curren
> * - other flags in MSW
> */
> #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
> -#define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
> -#define TIF_SIGPENDING 2 /* signal pending */
> -#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> -#define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */
> -#define TIF_IRET 5 /* return with iret */
> -#define TIF_SYSCALL_EMU 6 /* syscall emulation active */
> -#define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
> -#define TIF_SECCOMP 8 /* secure computing */
> -#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
> +#define TIF_SIGPENDING 1 /* signal pending */
> +#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> +#define TIF_SINGLESTEP 3 /* restore singlestep on return to user mode */
> +#define TIF_IRET 4 /* return with iret */
> +#define TIF_SYSCALL_EMU 5 /* syscall emulation active */
> +#define TIF_SYSCALL_AUDIT 6 /* syscall auditing active */
> +#define TIF_SECCOMP 7 /* secure computing */
> +#define TIF_RESTORE_SIGMASK 8 /* restore signal mask in do_signal() */
> #define TIF_MEMDIE 16
> #define TIF_DEBUG 17 /* uses debug registers */
> #define TIF_IO_BITMAP 18 /* uses I/O bitmap */
> #define TIF_FREEZE 19 /* is freezing for suspend */
>
> #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
> -#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
> #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
> #define _TIF_SINGLESTEP (1<<TIF_SINGLESTEP)
> diff -urNp --exclude=.git linux-2.6.22.orig/include/asm-ia64/thread_info.h linux-2.6.22.base/include/asm-ia64/thread_info.h
> --- linux-2.6.22.orig/include/asm-ia64/thread_info.h 2007-05-29 03:16:27.000000000 -0700
> +++ linux-2.6.22.base/include/asm-ia64/thread_info.h 2007-05-29 03:20:21.000000000 -0700
> @@ -79,13 +79,13 @@ struct thread_info {
> * - pending work-to-be-done flags are in least-significant 16 bits, other flags
> * in top 16 bits
> */
> -#define TIF_NOTIFY_RESUME 0 /* resumption notification requested */
> -#define TIF_SIGPENDING 1 /* signal pending */
> -#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
> -#define TIF_SYSCALL_TRACE 3 /* syscall trace active */
> -#define TIF_SYSCALL_AUDIT 4 /* syscall auditing active */
> -#define TIF_SINGLESTEP 5 /* restore singlestep on return to user mode */
> -#define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */
> +#define TIF_SIGPENDING 0 /* signal pending */
> +#define TIF_NEED_RESCHED 1 /* rescheduling necessary */
> +#define TIF_SYSCALL_TRACE 2 /* syscall trace active */
> +#define TIF_SYSCALL_AUDIT 3 /* syscall auditing active */
> +#define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */
> +#define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */
> +#define TIF_PERFMON_WORK 6 /* work for pfm_handle_work() */
> #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */
> #define TIF_MEMDIE 17
> #define TIF_MCA_INIT 18 /* this task is processing MCA or INIT */
> @@ -96,8 +96,8 @@ struct thread_info {
> #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
> #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP)
> #define _TIF_SYSCALL_TRACEAUDIT (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP)
> -#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
> #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
> +#define _TIF_PERFMON_WORK (1 << TIF_PERFMON_WORK)
> #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
> #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
> #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
> @@ -106,7 +106,9 @@ struct thread_info {
> #define _TIF_FREEZE (1 << TIF_FREEZE)
>
> /* "work to do on user-return" bits */
> -#define TIF_ALLWORK_MASK (_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_RESTORE_SIGMASK)
> +#define TIF_ALLWORK_MASK (_TIF_SIGPENDING|_TIF_PERFMON_WORK|_TIF_SYSCALL_AUDIT|\
> + _TIF_NEED_RESCHED| _TIF_SYSCALL_TRACE|\
> + _TIF_RESTORE_SIGMASK)
> /* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */
> #define TIF_WORK_MASK (TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))

The addition of TIF_PERFMON_WORK is undocumented in the changelog but
appears to simply replace TIF_NOTIFY_RESUME on ia64 in this patch and
i386, powerpc, x86_64, and mips in patches 15, 17, 19, and 21,
respectively. It'd be much easier to just change the name in these cases
instead of all the #define shifts.

David
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/