Merge branch 'akpm' (patches from Andrew Morton) into next

Merge more updates from Andrew Morton:

 - Most of the rest of MM.

   This includes "mark remap_file_pages syscall as deprecated" but the
   actual "replace remap_file_pages syscall with emulation" is held
   back.  I guess we'll need to work out when to pull the trigger on
   that one.

 - various minor cleanups to obscure filesystems

 - the drivers/rtc queue

 - hfsplus updates

 - ufs, hpfs, fatfs, affs, reiserfs

 - Documentation/

 - signals

 - procfs

 - cpu hotplug

 - lib/idr.c

 - rapidio

 - sysctl

 - ipc updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

1 files changed, 13 insertions, 9 deletions

diff --git a/arch/arm/mach-at91/sysirq_mask.c b/arch/arm/mach-at91/sysirq_mask.c
index 2ba694f9626b..f8bc3511a8c8 100644
--- a/arch/arm/mach-at91/sysirq_mask.c
+++ b/arch/arm/mach-at91/sysirq_mask.c
@@ -25,24 +25,28 @@
 
 #include "generic.h"
 
-#define AT91_RTC_IDR    0x24    /* Interrupt Disable Register */
-#define AT91_RTC_IMR    0x28    /* Interrupt Mask Register */
+#define AT91_RTC_IDR            0x24    /* Interrupt Disable Register */
+#define AT91_RTC_IMR            0x28    /* Interrupt Mask Register */
+#define AT91_RTC_IRQ_MASK       0x1f    /* Available IRQs mask */
 
 void __init at91_sysirq_mask_rtc(u32 rtc_base)
 {
         void __iomem *base;
-        u32 mask;
 
         base = ioremap(rtc_base, 64);
         if (!base)
                 return;
 
-        mask = readl_relaxed(base + AT91_RTC_IMR);
-        if (mask) {
-                pr_info("AT91: Disabling rtc irq\n");
-                writel_relaxed(mask, base + AT91_RTC_IDR);
-                (void)readl_relaxed(base + AT91_RTC_IMR);       /* flush */
-        }
+        /*
+         * sam9x5 SoCs have the following errata:
+         * "RTC: Interrupt Mask Register cannot be used
+         *  Interrupt Mask Register read always returns 0."
+         *
+         * Hence we're not relying on IMR values to disable
+         * interrupts.
+         */
+        writel_relaxed(AT91_RTC_IRQ_MASK, base + AT91_RTC_IDR);
+        (void)readl_relaxed(base + AT91_RTC_IMR);       /* flush */
 
         iounmap(base);
 }