Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 0 insertions, 3 deletions

diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 8afb953e31c6..d10c80ebb67a 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -1663,9 +1663,6 @@ static void watchdog(struct rq *rq, struct task_struct *p)
 {
         unsigned long soft, hard;
 
-        if (!p->signal)
-                return;
-
         /* max may change after cur was read, this will be fixed next tick */
         soft = task_rlimit(p, RLIMIT_RTTIME);
         hard = task_rlimit_max(p, RLIMIT_RTTIME);