Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a583f1b5 authored by Stephane Eranian's avatar Stephane Eranian Committed by Linus Torvalds
Browse files

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: default avatarstephane eranian <eranian@hpl.hp.com>
Cc: <linux-arch@vger.kernel.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd4f0ef7

arch/arm/kernel/entry-common.S

+1 −1
Original line number Diff line number Diff line
@@ -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'

arch/arm26/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -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'

arch/ia64/kernel/perfmon.c

+2 −2
Original line number Diff line number Diff line
@@ -591,13 +591,13 @@ pfm_set_task_notify(struct task_struct *task) 
	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

arch/powerpc/kernel/entry_64.S

+0 −1
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES) 
	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? */

arch/x86_64/kernel/entry.S

+3 −3
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ sysret_careful: 
sysret_signal:

	TRACE_IRQS_ON

	sti

	testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx

	testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%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|_TIF_MCE_NOTIFY),%edx

	testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%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|_TIF_MCE_NOTIFY),%edx

	testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx

	jz    retint_swapgs

	TRACE_IRQS_ON

	sti