Merge branch 'master' into for-next

Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes.  As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.

Conflicts:
	arch/alpha/include/asm/percpu.h
	arch/mn10300/kernel/vmlinux.lds.S
	include/linux/percpu-defs.h

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b5db8b883615..9c2e10082b79 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -140,7 +140,7 @@ static irqreturn_t cpm_i2c_interrupt(int irq, void *dev_id)
 
         dev_dbg(&adap->dev, "Interrupt: %x\n", i);
 
-        wake_up_interruptible(&cpm->i2c_wait);
+        wake_up(&cpm->i2c_wait);
 
         return i ? IRQ_HANDLED : IRQ_NONE;
 }
@@ -364,12 +364,12 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                 dev_dbg(&adap->dev, "test ready.\n");
                 pmsg = &msgs[tptr];
                 if (pmsg->flags & I2C_M_RD)
-                        ret = wait_event_interruptible_timeout(cpm->i2c_wait,
+                        ret = wait_event_timeout(cpm->i2c_wait,
                                 (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) ||
                                 !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY),
                                 1 * HZ);
                 else
-                        ret = wait_event_interruptible_timeout(cpm->i2c_wait,
+                        ret = wait_event_timeout(cpm->i2c_wait,
                                 !(in_be16(&tbdf[tptr].cbd_sc) & BD_SC_READY),
                                 1 * HZ);
                 if (ret == 0) {