iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  iommu: fix Intel IOMMU write-buffer flushing
  futex: fix reference leak

Trivial conflicts fixed manually in drivers/pci/intel-iommu.c
This commit is contained in:
Linus Torvalds 2009-02-17 14:26:35 -08:00
commit 8ce9a75a30
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/intel-iommu.c
View File

@ -61,7 +61,7 @@
/* global iommu list, set NULL for ignored DMAR units */ /* global iommu list, set NULL for ignored DMAR units */
static struct intel_iommu **g_iommus; static struct intel_iommu **g_iommus;
static int rwbf_quirk = 0; static int rwbf_quirk;
/* /*
* 0: Present * 0: Present
@ -3142,8 +3142,10 @@ static struct iommu_ops intel_iommu_ops = {
static void __devinit quirk_iommu_rwbf(struct pci_dev *dev) static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
{ {
/* Mobile 4 Series Chipset neglects to set RWBF capability, /*
but needs it */ * Mobile 4 Series Chipset neglects to set RWBF capability,
* but needs it:
*/
printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n"); printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
rwbf_quirk = 1; rwbf_quirk = 1;
} }

51
kernel/futex.c
View File

@ -1165,6 +1165,7 @@ static int futex_wait(u32 __user *uaddr, int fshared,
u32 val, ktime_t *abs_time, u32 bitset, int clockrt) u32 val, ktime_t *abs_time, u32 bitset, int clockrt)
{ {
struct task_struct *curr = current; struct task_struct *curr = current;
struct restart_block *restart;
DECLARE_WAITQUEUE(wait, curr); DECLARE_WAITQUEUE(wait, curr);
struct futex_hash_bucket *hb; struct futex_hash_bucket *hb;
struct futex_q q; struct futex_q q;
@ -1216,11 +1217,13 @@ retry:
if (!ret) if (!ret)
goto retry; goto retry;
return ret; goto out;
} }
ret = -EWOULDBLOCK; ret = -EWOULDBLOCK;
if (uval != val) if (unlikely(uval != val)) {
goto out_unlock_put_key; queue_unlock(&q, hb);
goto out_put_key;
}
/* Only actually queue if *uaddr contained val. */ /* Only actually queue if *uaddr contained val. */
queue_me(&q, hb); queue_me(&q, hb);
@ -1284,38 +1287,38 @@ retry:
*/ */
/* If we were woken (and unqueued), we succeeded, whatever. */ /* If we were woken (and unqueued), we succeeded, whatever. */
ret = 0;
if (!unqueue_me(&q)) if (!unqueue_me(&q))
return 0; goto out_put_key;
ret = -ETIMEDOUT;
if (rem) if (rem)
return -ETIMEDOUT; goto out_put_key;
/* /*
* We expect signal_pending(current), but another thread may * We expect signal_pending(current), but another thread may
* have handled it for us already. * have handled it for us already.
*/ */
ret = -ERESTARTSYS;
if (!abs_time) if (!abs_time)
return -ERESTARTSYS; goto out_put_key;
else {
struct restart_block *restart;
restart = &current_thread_info()->restart_block;
restart->fn = futex_wait_restart;
restart->futex.uaddr = (u32 *)uaddr;
restart->futex.val = val;
restart->futex.time = abs_time->tv64;
restart->futex.bitset = bitset;
restart->futex.flags = 0;
if (fshared) restart = &current_thread_info()->restart_block;
restart->futex.flags |= FLAGS_SHARED; restart->fn = futex_wait_restart;
if (clockrt) restart->futex.uaddr = (u32 *)uaddr;
restart->futex.flags |= FLAGS_CLOCKRT; restart->futex.val = val;
return -ERESTART_RESTARTBLOCK; restart->futex.time = abs_time->tv64;
} restart->futex.bitset = bitset;
restart->futex.flags = 0;
out_unlock_put_key: if (fshared)
queue_unlock(&q, hb); restart->futex.flags |= FLAGS_SHARED;
if (clockrt)
restart->futex.flags |= FLAGS_CLOCKRT;
ret = -ERESTART_RESTARTBLOCK;
out_put_key:
put_futex_key(fshared, &q.key); put_futex_key(fshared, &q.key);
out: out:
return ret; return ret;
} }