aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephane Eranian <eranian@hpl.hp.com>2007-07-31 03:38:00 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 18:39:38 -0400
commita583f1b54249b11ad1ffd14c6e74d28fcbc59c07 (patch)
tree3220e8baad9631c7d24175f712833aa5a0d468ae /arch
parentcd4f0ef7c03e79f92a883843662e3d0eaae26fb4 (diff)
remove unused TIF_NOTIFY_RESUME flag
Remove unused TIF_NOTIFY_RESUME flag for all processor architectures. The flag was not used excecpt on IA-64 where the patch replaces it with TIF_PERFMON_WORK. Signed-off-by: stephane eranian <eranian@hpl.hp.com> Cc: <linux-arch@vger.kernel.org> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/entry-common.S2
-rw-r--r--arch/arm26/kernel/entry.S2
-rw-r--r--arch/ia64/kernel/perfmon.c4
-rw-r--r--arch/powerpc/kernel/entry_64.S1
-rw-r--r--arch/x86_64/kernel/entry.S6
5 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index c589dc3ecd1a..33e6cc2ffd3b 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -46,7 +46,7 @@ fast_work_pending:
46work_pending: 46work_pending:
47 tst r1, #_TIF_NEED_RESCHED 47 tst r1, #_TIF_NEED_RESCHED
48 bne work_resched 48 bne work_resched
49 tst r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING 49 tst r1, #_TIF_SIGPENDING
50 beq no_work_pending 50 beq no_work_pending
51 mov r0, sp @ 'regs' 51 mov r0, sp @ 'regs'
52 mov r2, why @ 'syscall' 52 mov r2, why @ 'syscall'
diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S
index 91496cc687b1..7ffcc6e4770e 100644
--- a/arch/arm26/kernel/entry.S
+++ b/arch/arm26/kernel/entry.S
@@ -194,7 +194,7 @@ fast_work_pending:
194work_pending: 194work_pending:
195 tst r1, #_TIF_NEED_RESCHED 195 tst r1, #_TIF_NEED_RESCHED
196 bne work_resched 196 bne work_resched
197 tst r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING 197 tst r1, #_TIF_SIGPENDING
198 beq no_work_pending 198 beq no_work_pending
199 mov r0, sp @ 'regs' 199 mov r0, sp @ 'regs'
200 mov r2, why @ 'syscall' 200 mov r2, why @ 'syscall'
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index b7133cabdbea..14b8e5a6222b 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -591,13 +591,13 @@ pfm_set_task_notify(struct task_struct *task)
591 struct thread_info *info; 591 struct thread_info *info;
592 592
593 info = (struct thread_info *) ((char *) task + IA64_TASK_SIZE); 593 info = (struct thread_info *) ((char *) task + IA64_TASK_SIZE);
594 set_bit(TIF_NOTIFY_RESUME, &info->flags); 594 set_bit(TIF_PERFMON_WORK, &info->flags);
595} 595}
596 596
597static inline void 597static inline void
598pfm_clear_task_notify(void) 598pfm_clear_task_notify(void)
599{ 599{
600 clear_thread_flag(TIF_NOTIFY_RESUME); 600 clear_thread_flag(TIF_PERFMON_WORK);
601} 601}
602 602
603static inline void 603static inline void
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2b66d53dcc55..9ef28da2c7fe 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -546,7 +546,6 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
546 rfid 546 rfid
547 b . /* prevent speculative execution */ 547 b . /* prevent speculative execution */
548 548
549/* Note: this must change if we start using the TIF_NOTIFY_RESUME bit */
550do_work: 549do_work:
551#ifdef CONFIG_PREEMPT 550#ifdef CONFIG_PREEMPT
552 andi. r0,r3,MSR_PR /* Returning to user mode? */ 551 andi. r0,r3,MSR_PR /* Returning to user mode? */
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 830cfc6ee8cb..1d232e5f5658 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -282,7 +282,7 @@ sysret_careful:
282sysret_signal: 282sysret_signal:
283 TRACE_IRQS_ON 283 TRACE_IRQS_ON
284 sti 284 sti
285 testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx 285 testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
286 jz 1f 286 jz 1f
287 287
288 /* Really a signal */ 288 /* Really a signal */
@@ -375,7 +375,7 @@ int_very_careful:
375 jmp int_restore_rest 375 jmp int_restore_rest
376 376
377int_signal: 377int_signal:
378 testl $(_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx 378 testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
379 jz 1f 379 jz 1f
380 movq %rsp,%rdi # &ptregs -> arg1 380 movq %rsp,%rdi # &ptregs -> arg1
381 xorl %esi,%esi # oldset -> arg2 381 xorl %esi,%esi # oldset -> arg2
@@ -599,7 +599,7 @@ retint_careful:
599 jmp retint_check 599 jmp retint_check
600 600
601retint_signal: 601retint_signal:
602 testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx 602 testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
603 jz retint_swapgs 603 jz retint_swapgs
604 TRACE_IRQS_ON 604 TRACE_IRQS_ON
605 sti 605 sti