From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Tue, 15 Nov 2011 21:54:36 +0000 (-0800)
Subject: Merge branch 'upstream/ticketlock-cleanup' into upstream/xen
X-Git-Tag: next-20120402~15^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=59e9a6b1ee9fa3992860eb6c48a37b163e97d205;p=karo-tx-linux.git

Merge branch 'upstream/ticketlock-cleanup' into upstream/xen

* upstream/ticketlock-cleanup:
  x86: consolidate xchg and xadd macros
  x86/cmpxchg: add a locked add() helper
---

59e9a6b1ee9fa3992860eb6c48a37b163e97d205