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

Commit f3de272b authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

signals: use HAVE_SET_RESTORE_SIGMASK 



Change all the #ifdef TIF_RESTORE_SIGMASK conditionals in non-arch code to
#ifdef HAVE_SET_RESTORE_SIGMASK.  If arch code defines it first, the generic
set_restore_sigmask() using TIF_RESTORE_SIGMASK is not defined.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
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 49eaeb4b

fs/compat.c

+4 −4
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, 
	return ret;

}



#ifdef TIF_RESTORE_SIGMASK

#ifdef HAVE_SET_RESTORE_SIGMASK

asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,

	compat_ulong_t __user *outp, compat_ulong_t __user *exp,

	struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask,
@@ -1825,7 +1825,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, 


	return ret;

}

#endif /* TIF_RESTORE_SIGMASK */

#endif /* HAVE_SET_RESTORE_SIGMASK */



#if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)

/* Stuff for NFS server syscalls... */
@@ -2080,7 +2080,7 @@ long asmlinkage compat_sys_nfsservctl(int cmd, void *notused, void *notused2) 


#ifdef CONFIG_EPOLL



#ifdef TIF_RESTORE_SIGMASK

#ifdef HAVE_SET_RESTORE_SIGMASK

asmlinkage long compat_sys_epoll_pwait(int epfd,

			struct compat_epoll_event __user *events,

			int maxevents, int timeout,
@@ -2124,7 +2124,7 @@ asmlinkage long compat_sys_epoll_pwait(int epfd, 


	return err;

}

#endif /* TIF_RESTORE_SIGMASK */

#endif /* HAVE_SET_RESTORE_SIGMASK */



#endif /* CONFIG_EPOLL */

fs/eventpoll.c

+2 −2
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ asmlinkage long sys_epoll_wait(int epfd, struct epoll_event __user *events, 
	return error;

}



#ifdef TIF_RESTORE_SIGMASK

#ifdef HAVE_SET_RESTORE_SIGMASK



/*

 * Implement the event wait interface for the eventpoll file. It is the kernel
@@ -1287,7 +1287,7 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events, 
	return error;

}



#endif /* #ifdef TIF_RESTORE_SIGMASK */

#endif /* HAVE_SET_RESTORE_SIGMASK */



static int __init eventpoll_init(void)

{

fs/select.c

+4 −4
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp, 
	return ret;

}



#ifdef TIF_RESTORE_SIGMASK

#ifdef HAVE_SET_RESTORE_SIGMASK

asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp,

		fd_set __user *exp, struct timespec __user *tsp,

		const sigset_t __user *sigmask, size_t sigsetsize)
@@ -528,7 +528,7 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, 


	return sys_pselect7(n, inp, outp, exp, tsp, up, sigsetsize);

}

#endif /* TIF_RESTORE_SIGMASK */

#endif /* HAVE_SET_RESTORE_SIGMASK */



struct poll_list {

	struct poll_list *next;
@@ -759,7 +759,7 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds, 
	return ret;

}



#ifdef TIF_RESTORE_SIGMASK

#ifdef HAVE_SET_RESTORE_SIGMASK

asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,

	struct timespec __user *tsp, const sigset_t __user *sigmask,

	size_t sigsetsize)
@@ -839,4 +839,4 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, 


	return ret;

}

#endif /* TIF_RESTORE_SIGMASK */
 
#endif /* HAVE_SET_RESTORE_SIGMASK */

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ struct task_struct { 
	struct sighand_struct *sighand;



	sigset_t blocked, real_blocked;

	sigset_t saved_sigmask;		/* To be restored with TIF_RESTORE_SIGMASK */

	sigset_t saved_sigmask;	/* restored if set_restore_sigmask() was used */

	struct sigpending pending;



	unsigned long sas_ss_sp;

include/linux/thread_info.h

+8 −2
Original line number Diff line number Diff line
@@ -92,7 +92,13 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag) 
#define set_need_resched()	set_thread_flag(TIF_NEED_RESCHED)

#define clear_need_resched()	clear_thread_flag(TIF_NEED_RESCHED)



#ifdef TIF_RESTORE_SIGMASK

#if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK

/*

 * An arch can define its own version of set_restore_sigmask() to get the

 * job done however works, with or without TIF_RESTORE_SIGMASK.

 */

#define HAVE_SET_RESTORE_SIGMASK	1



/**

 * set_restore_sigmask() - make sure saved_sigmask processing gets done

 *
@@ -109,7 +115,7 @@ static inline void set_restore_sigmask(void) 
	set_thread_flag(TIF_RESTORE_SIGMASK);

	set_thread_flag(TIF_SIGPENDING);

}

#endif	/* TIF_RESTORE_SIGMASK */

#endif	/* TIF_RESTORE_SIGMASK && !HAVE_SET_RESTORE_SIGMASK */



#endif	/* __KERNEL__ */