Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 7 insertions, 3 deletions

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 6d91fcb4c5cb..a10380bfbeac 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -472,6 +472,9 @@ struct regmap_irq {
  * @ack_base:    Base ack address.  If zero then the chip is clear on read.
  * @wake_base:   Base address for wake enables.  If zero unsupported.
  * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.
+ * @init_ack_masked: Ack all masked interrupts once during initalization.
+ * @mask_invert: Inverted mask register: cleared bits are masked out.
+ * @wake_invert: Inverted wake register: cleared bits are wake enabled.
  * @runtime_pm:  Hold a runtime PM lock on the device when accessing it.
  *
  * @num_regs:    Number of registers in each control bank.
@@ -487,9 +490,10 @@ struct regmap_irq_chip {
         unsigned int ack_base;
         unsigned int wake_base;
         unsigned int irq_reg_stride;
-        unsigned int mask_invert;
-        unsigned int wake_invert;
-        bool runtime_pm;
+        bool init_ack_masked:1;
+        bool mask_invert:1;
+        bool wake_invert:1;
+        bool runtime_pm:1;
 
         int num_regs;