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

Commit 8ce9a75a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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

* '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
parents b30b7749 9af88143

drivers/pci/intel-iommu.c

+5 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
/* global iommu list, set NULL for ignored DMAR units */

static struct intel_iommu **g_iommus;



static int rwbf_quirk = 0;

static int rwbf_quirk;



/*

 * 0: Present
@@ -3142,8 +3142,10 @@ static struct iommu_ops intel_iommu_ops = { 


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");

	rwbf_quirk = 1;

}

kernel/futex.c

+28 −25
Original line number Diff line number Diff line
@@ -1165,6 +1165,7 @@ static int futex_wait(u32 __user *uaddr, int fshared, 
		      u32 val, ktime_t *abs_time, u32 bitset, int clockrt)

{

	struct task_struct *curr = current;

	struct restart_block *restart;

	DECLARE_WAITQUEUE(wait, curr);

	struct futex_hash_bucket *hb;

	struct futex_q q;
@@ -1216,11 +1217,13 @@ retry: 


		if (!ret)

			goto retry;

		return ret;

		goto out;

	}

	ret = -EWOULDBLOCK;

	if (uval != val)

		goto out_unlock_put_key;

	if (unlikely(uval != val)) {

		queue_unlock(&q, hb);

		goto out_put_key;

	}



	/* Only actually queue if *uaddr contained val.  */

	queue_me(&q, hb);
@@ -1284,19 +1287,21 @@ retry: 
	 */



	/* If we were woken (and unqueued), we succeeded, whatever. */

	ret = 0;

	if (!unqueue_me(&q))

		return 0;

		goto out_put_key;

	ret = -ETIMEDOUT;

	if (rem)

		return -ETIMEDOUT;

		goto out_put_key;



	/*

	 * We expect signal_pending(current), but another thread may

	 * have handled it for us already.

	 */

	ret = -ERESTARTSYS;

	if (!abs_time)

		return -ERESTARTSYS;

	else {

		struct restart_block *restart;

		goto out_put_key;



	restart = &current_thread_info()->restart_block;

	restart->fn = futex_wait_restart;

	restart->futex.uaddr = (u32 *)uaddr;
@@ -1309,13 +1314,11 @@ retry: 
		restart->futex.flags |= FLAGS_SHARED;

	if (clockrt)

		restart->futex.flags |= FLAGS_CLOCKRT;

		return -ERESTART_RESTARTBLOCK;

	}



out_unlock_put_key:

	queue_unlock(&q, hb);

	put_futex_key(fshared, &q.key);

	ret = -ERESTART_RESTARTBLOCK;



out_put_key:

	put_futex_key(fshared, &q.key);

out:

	return ret;

}