Messages in this thread Patch in this message | | | Date | Fri, 21 Dec 2012 09:26:51 -0600 | From | Clark Williams <> | Subject | Re: [ANNOUNCE] 3.6.11-rt24 (apocalypse release)c |
| |
On Fri, 21 Dec 2012 14:50:38 +0100 (CET) Thomas Gleixner <tglx@linutronix.de> wrote: > Index: linux-stable/block/blk-ioc.c > =================================================================== > --- linux-stable.orig/block/blk-ioc.c > +++ linux-stable/block/blk-ioc.c > @@ -110,7 +110,7 @@ static void ioc_release_fn(struct work_s > spin_unlock(q->queue_lock); > } else { > spin_unlock_irqrestore(&ioc->lock, flags); > - cpu_relax(); > + cpu_chill(); > spin_lock_irqsave_nested(&ioc->lock, flags, 1); > } > } > @@ -188,7 +188,7 @@ retry: > spin_unlock(icq->q->queue_lock); > } else { > spin_unlock_irqrestore(&ioc->lock, flags); > - cpu_relax(); > + cpu_chill(); > goto retry; > } > } >
Thomas,
I had to add this to get -rt24 to compile:
commit cb25d4b84a6d8f155134f6d9aa2997a452ab1dca Author: Clark Williams <williams@redhat.com> Date: Fri Dec 21 09:22:26 2012 -0600
[RT] pull in include/linux/delay.h to get cpu_chill()
Signed-off-by: Clark Williams <williams@redhat.com>
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index 2332787..fb21ad5 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -8,6 +8,7 @@ #include <linux/blkdev.h> #include <linux/bootmem.h> /* for max_pfn/max_low_pfn */ #include <linux/slab.h> +#include <linux/delay.h> #include "blk.h" [unhandled content-type:application/pgp-signature] | |