14 files changed, 99 insertions, 45 deletions

diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index 346485910732..9d1cf7156895 100644
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -20,7 +20,7 @@
 
 static unsigned int isa_membase, isa_portbase, isa_portshift;
 
-static ctl_table ctl_isa_vars[4] = {
+static struct ctl_table ctl_isa_vars[4] = {
         {
                 .procname       = "membase",
                 .data           = &isa_membase, 
@@ -44,7 +44,7 @@ static ctl_table ctl_isa_vars[4] = {
 
 static struct ctl_table_header *isa_sysctl_header;
 
-static ctl_table ctl_isa[2] = {
+static struct ctl_table ctl_isa[2] = {
         {
                 .procname       = "isa",
                 .mode           = 0555,
@@ -52,7 +52,7 @@ static ctl_table ctl_isa[2] = {
         }, {}
 };
 
-static ctl_table ctl_bus[2] = {
+static struct ctl_table ctl_bus[2] = {
         {
                 .procname       = "bus",
                 .mode           = 0555,
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);
 }
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index f8c40a66e65d..c5f0a47a1375 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -257,6 +257,19 @@
                                 enable-offset = <0x0>;
                                 enable-mask = <0x39>;
                         };
+
+                        rtcclk: rtcclk@17000000 {
+                                compatible = "apm,xgene-device-clock";
+                                #clock-cells = <1>;
+                                clocks = <&socplldiv2 0>;
+                                reg = <0x0 0x17000000 0x0 0x2000>;
+                                reg-names = "csr-reg";
+                                csr-offset = <0xc>;
+                                csr-mask = <0x2>;
+                                enable-offset = <0x10>;
+                                enable-mask = <0x2>;
+                                clock-output-names = "rtcclk";
+                        };
                 };
 
                 serial0: serial@1c020000 {
@@ -342,5 +355,13 @@
                         phys = <&phy3 0>;
                         phy-names = "sata-phy";
                 };
+
+                rtc: rtc@10510000 {
+                        compatible = "apm,xgene-rtc";
+                        reg = <0x0 0x10510000 0x0 0x400>;
+                        interrupts = <0x0 0x46 0x4>;
+                        #clock-cells = <1>;
+                        clocks = <&rtcclk 0>;
+                };
         };
 };
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index e1f88e028cfe..8b8fe671b1a6 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -117,6 +117,7 @@ put_reg(struct task_struct *task, unsigned long regno, unsigned long data)
 int
 is_user_addr_valid(struct task_struct *child, unsigned long start, unsigned long len)
 {
+        bool valid;
         struct vm_area_struct *vma;
         struct sram_list_struct *sraml;
 
@@ -124,9 +125,12 @@ is_user_addr_valid(struct task_struct *child, unsigned long start, unsigned long
         if (start + len < start)
                 return -EIO;
 
+        down_read(&child->mm->mmap_sem);
         vma = find_vma(child->mm, start);
-        if (vma && start >= vma->vm_start && start + len <= vma->vm_end)
-                        return 0;
+        valid = vma && start >= vma->vm_start && start + len <= vma->vm_end;
+        up_read(&child->mm->mmap_sem);
+        if (valid)
+                return 0;
 
         for (sraml = child->mm->context.sram_list; sraml; sraml = sraml->next)
                 if (start >= (unsigned long)sraml->addr
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index f4374bae4fb4..64285e0d3481 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -833,8 +833,8 @@ static int __init gpio_init(void)
         printk(KERN_INFO "ETRAX 100LX GPIO driver v2.5, (c) 2001-2008 "
                 "Axis Communications AB\n");
         /* We call etrax_gpio_wake_up_check() from timer interrupt and
-         * from cpu_idle() in kernel/process.c
-         * The check in cpu_idle() reduces latency from ~15 ms to ~6 ms
+         * from default_idle() in kernel/process.c
+         * The check in default_idle() reduces latency from ~15 ms to ~6 ms
          * in some tests.
          */
         res = request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
diff --git a/arch/cris/arch-v32/drivers/mach-fs/gpio.c b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
index 9e54273af0ca..009f4ee1bd09 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
@@ -958,11 +958,7 @@ gpio_init(void)
 
         printk(KERN_INFO "ETRAX FS GPIO driver v2.5, (c) 2003-2007 "
                 "Axis Communications AB\n");
-        /* We call etrax_gpio_wake_up_check() from timer interrupt and
-         * from cpu_idle() in kernel/process.c
-         * The check in cpu_idle() reduces latency from ~15 ms to ~6 ms
-         * in some tests.
-         */
+        /* We call etrax_gpio_wake_up_check() from timer interrupt */
         if (request_irq(TIMER0_INTR_VECT, gpio_poll_timer_interrupt,
                         IRQF_SHARED, "gpio poll", &alarmlist))
                 printk(KERN_ERR "timer0 irq for gpio\n");
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index b942f4032d7a..2955f359e2a7 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -237,7 +237,7 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
 }
 
 #ifdef CONFIG_SYSCTL
-static ctl_table kdump_ctl_table[] = {
+static struct ctl_table kdump_ctl_table[] = {
         {
                 .procname = "kdump_on_init",
                 .data = &kdump_on_init,
@@ -255,7 +255,7 @@ static ctl_table kdump_ctl_table[] = {
         { }
 };
 
-static ctl_table sys_table[] = {
+static struct ctl_table sys_table[] = {
         {
           .procname = "kernel",
           .mode = 0555,
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index d841c4bd6864..5845ffea67c3 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -521,7 +521,7 @@ static pmu_config_t		*pmu_conf;
 pfm_sysctl_t pfm_sysctl;
 EXPORT_SYMBOL(pfm_sysctl);
 
-static ctl_table pfm_ctl_table[]={
+static struct ctl_table pfm_ctl_table[] = {
         {
                 .procname       = "debug",
                 .data           = &pfm_sysctl.debug,
@@ -552,7 +552,7 @@ static ctl_table pfm_ctl_table[]={
         },
         {}
 };
-static ctl_table pfm_sysctl_dir[] = {
+static struct ctl_table pfm_sysctl_dir[] = {
         {
                 .procname       = "perfmon",
                 .mode           = 0555,
@@ -560,7 +560,7 @@ static ctl_table pfm_sysctl_dir[] = {
         },
         {}
 };
-static ctl_table pfm_sysctl_root[] = {
+static struct ctl_table pfm_sysctl_root[] = {
         {
                 .procname       = "kernel",
                 .mode           = 0555,
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
index 214320b50384..8c8ce5e1ee0e 100644
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
@@ -60,15 +60,6 @@ static inline int __gen_sigismember(sigset_t *set, int _sig)
          __const_sigismember(set,sig) :         \
          __gen_sigismember(set,sig))
 
-static inline int sigfindinword(unsigned long word)
-{
-        asm ("bfffo %1{#0,#0},%0"
-                : "=d" (word)
-                : "d" (word & -word)
-                : "cc");
-        return word ^ 31;
-}
-
 #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
 
 #ifndef __uClinux__
diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile
index 3d5d2c56de8d..bd74e05c90b0 100644
--- a/arch/mips/dec/Makefile
+++ b/arch/mips/dec/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-y           := ecc-berr.o int-handler.o ioasic-irq.o kn01-berr.o \
-                   kn02-irq.o kn02xa-berr.o reset.o setup.o time.o
+                   kn02-irq.o kn02xa-berr.o platform.o reset.o setup.o time.o
 
 obj-$(CONFIG_TC)                += tc.o
 obj-$(CONFIG_CPU_HAS_WB)        += wbflush.o
diff --git a/arch/mips/dec/platform.c b/arch/mips/dec/platform.c
new file mode 100644
index 000000000000..c7ac86af847a
--- /dev/null
+++ b/arch/mips/dec/platform.c
@@ -0,0 +1,44 @@
+/*
+ *      DEC platform devices.
+ *
+ *      Copyright (c) 2014  Maciej W. Rozycki
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
+#include <linux/platform_device.h>
+
+static struct resource dec_rtc_resources[] = {
+        {
+                .name = "rtc",
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static struct cmos_rtc_board_info dec_rtc_info = {
+        .flags = CMOS_RTC_FLAGS_NOFREQ,
+        .address_space = 64,
+};
+
+static struct platform_device dec_rtc_device = {
+        .name = "rtc_cmos",
+        .id = PLATFORM_DEVID_NONE,
+        .dev.platform_data = &dec_rtc_info,
+        .resource = dec_rtc_resources,
+        .num_resources = ARRAY_SIZE(dec_rtc_resources),
+};
+
+static int __init dec_add_devices(void)
+{
+        dec_rtc_resources[0].start = RTC_PORT(0);
+        dec_rtc_resources[0].end = RTC_PORT(0) + dec_kn_slot_size - 1;
+        return platform_device_register(&dec_rtc_device);
+}
+
+device_initcall(dec_add_devices);
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index ca1cd7459c4a..248ee7e5bebd 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -304,7 +304,7 @@ void notrace restore_interrupts(void)
  * being re-enabled and generally sanitized the lazy irq state,
  * and in the latter case it will leave with interrupts hard
  * disabled and marked as such, so the local_irq_enable() call
- * in cpu_idle() will properly re-enable everything.
+ * in arch_cpu_idle() will properly re-enable everything.
  */
 bool prep_irq_for_idle(void)
 {
diff --git a/arch/tile/kernel/proc.c b/arch/tile/kernel/proc.c
index 681100c59fda..6829a9508649 100644
--- a/arch/tile/kernel/proc.c
+++ b/arch/tile/kernel/proc.c
@@ -113,7 +113,7 @@ arch_initcall(proc_tile_init);
  * Support /proc/sys/tile directory
  */
 
-static ctl_table unaligned_subtable[] = {
+static struct ctl_table unaligned_subtable[] = {
         {
                 .procname       = "enabled",
                 .data           = &unaligned_fixup,
@@ -138,7 +138,7 @@ static ctl_table unaligned_subtable[] = {
         {}
 };
 
-static ctl_table unaligned_table[] = {
+static struct ctl_table unaligned_table[] = {
         {
                 .procname       = "unaligned_fixup",
                 .mode           = 0555,
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 35e67a457182..31eab867e6d3 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -92,12 +92,6 @@ static inline int __gen_sigismember(sigset_t *set, int _sig)
          ? __const_sigismember((set), (sig))    \
          : __gen_sigismember((set), (sig)))
 
-static inline int sigfindinword(unsigned long word)
-{
-        asm("bsfl %1,%0" : "=r"(word) : "rm"(word) : "cc");
-        return word;
-}
-
 struct pt_regs;
 
 #else /* __i386__ */