[PATCH] Kernel 3.4.1 stable patched with 3.4-rt8 patch won't build

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

I believe it is because of this patch in the mainline:
https://lkml.org/lkml/2012/5/14/348

Below please find a patch to reverse it. While I haven't run tests
against the resulting system, the patch below made kernel 3.4.1 with
rt8 patch builds and boots fine.

-baim

--- linux-3.4.1/kernel/workqueue.c	2012-06-05 16:32:44.908918296 +0800
+++ linux-3.4.1-rt/kernel/workqueue.c	2012-06-05 16:55:18.144882941 +0800
@@ -1208,13 +1208,8 @@
 				jiffies + IDLE_WORKER_TIMEOUT);
 	}

-	/*
-	 * Sanity check nr_running.  Because trustee releases gcwq->lock
-	 * between setting %WORKER_ROGUE and zapping nr_running, the
-	 * warning may trigger spuriously.  Check iff trustee is idle.
-	 */
-	WARN_ON_ONCE(gcwq->trustee_state == TRUSTEE_DONE &&
-		     gcwq->nr_workers == gcwq->nr_idle &&
+	/* sanity check nr_running */
+	WARN_ON_ONCE(gcwq->nr_workers == gcwq->nr_idle &&
 		     atomic_read(get_gcwq_nr_running(gcwq->cpu)));
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [RT Stable]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]

  Powered by Linux