Merge branch 'linus' into perfcounters/core

Conflicts:
	fs/exec.c
	include/linux/init_task.h

Simple context conflicts.

11 files changed, 94 insertions, 30 deletions

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 47ccec95f3e8..ef12794c3c68 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
                 return -ENOMEM;
 
         sachip->clk = clk_get(me, "SA1111_CLK");
-        if (!sachip->clk) {
+        if (IS_ERR(sachip->clk)) {
                 ret = PTR_ERR(sachip->clk);
                 goto err_free;
         }
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index c74f766ffc12..23af3c972c9a 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 
 #ifdef CONFIG_MMU
+EXPORT_SYMBOL(copy_page);
+
 EXPORT_SYMBOL(__copy_from_user);
 EXPORT_SYMBOL(__copy_to_user);
 EXPORT_SYMBOL(__clear_user);
@@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be);
 EXPORT_SYMBOL(_find_next_bit_be);
 #endif
 
-EXPORT_SYMBOL(copy_page);
-
 #ifdef CONFIG_FUNCTION_TRACER
 EXPORT_SYMBOL(mcount);
 #endif
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 57e6874d0b80..79abc4ddc0cf 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -18,6 +18,7 @@
 #include <linux/personality.h>
 #include <linux/kallsyms.h>
 #include <linux/delay.h>
+#include <linux/hardirq.h>
 #include <linux/init.h>
 #include <linux/uaccess.h>
 
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
index e7c6386782ed..5add22fc9899 100644
--- a/arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -177,7 +177,6 @@ static irqreturn_t fsg_reset_handler(int irq, void *dev_id)
 
 static void __init fsg_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
 
         ixp4xx_sys_init();
@@ -256,10 +255,10 @@ static void __init fsg_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "FSG: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, fsg_plat_eth[0].hwaddr));
-        printk(KERN_INFO "FSG: Using MAC address %s for port 1\n",
-               print_mac(mac_buf, fsg_plat_eth[1].hwaddr));
+        printk(KERN_INFO "FSG: Using MAC address %pM for port 0\n",
+               fsg_plat_eth[0].hwaddr);
+        printk(KERN_INFO "FSG: Using MAC address %pM for port 1\n",
+               fsg_plat_eth[1].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-ixp4xx/include/mach/qmgr.h b/arch/arm/mach-ixp4xx/include/mach/qmgr.h
index 1e52b95cede5..0cbe6ceb67c5 100644
--- a/arch/arm/mach-ixp4xx/include/mach/qmgr.h
+++ b/arch/arm/mach-ixp4xx/include/mach/qmgr.h
@@ -12,6 +12,8 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 
+#define DEBUG_QMGR      0
+
 #define HALF_QUEUES     32
 #define QUEUES          64      /* only 32 lower queues currently supported */
 #define MAX_QUEUE_LENGTH 4      /* in dwords */
@@ -61,22 +63,51 @@ void qmgr_enable_irq(unsigned int queue);
 void qmgr_disable_irq(unsigned int queue);
 
 /* request_ and release_queue() must be called from non-IRQ context */
+
+#if DEBUG_QMGR
+extern char qmgr_queue_descs[QUEUES][32];
+
 int qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
                        unsigned int nearly_empty_watermark,
-                       unsigned int nearly_full_watermark);
+                       unsigned int nearly_full_watermark,
+                       const char *desc_format, const char* name);
+#else
+int __qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
+                         unsigned int nearly_empty_watermark,
+                         unsigned int nearly_full_watermark);
+#define qmgr_request_queue(queue, len, nearly_empty_watermark,          \
+                           nearly_full_watermark, desc_format, name)    \
+        __qmgr_request_queue(queue, len, nearly_empty_watermark,        \
+                             nearly_full_watermark)
+#endif
+
 void qmgr_release_queue(unsigned int queue);
 
 
 static inline void qmgr_put_entry(unsigned int queue, u32 val)
 {
         extern struct qmgr_regs __iomem *qmgr_regs;
+#if DEBUG_QMGR
+        BUG_ON(!qmgr_queue_descs[queue]); /* not yet requested */
+
+        printk(KERN_DEBUG "Queue %s(%i) put %X\n",
+               qmgr_queue_descs[queue], queue, val);
+#endif
         __raw_writel(val, &qmgr_regs->acc[queue][0]);
 }
 
 static inline u32 qmgr_get_entry(unsigned int queue)
 {
+        u32 val;
         extern struct qmgr_regs __iomem *qmgr_regs;
-        return __raw_readl(&qmgr_regs->acc[queue][0]);
+        val = __raw_readl(&qmgr_regs->acc[queue][0]);
+#if DEBUG_QMGR
+        BUG_ON(!qmgr_queue_descs[queue]); /* not yet requested */
+
+        printk(KERN_DEBUG "Queue %s(%i) get %X\n",
+               qmgr_queue_descs[queue], queue, val);
+#endif
+        return val;
 }
 
 static inline int qmgr_get_stat1(unsigned int queue)
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
index c6cb069a5a83..bfddc73d0a20 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -14,8 +14,6 @@
 #include <linux/module.h>
 #include <mach/qmgr.h>
 
-#define DEBUG           0
-
 struct qmgr_regs __iomem *qmgr_regs;
 static struct resource *mem_res;
 static spinlock_t qmgr_lock;
@@ -23,6 +21,10 @@ static u32 used_sram_bitmap[4]; /* 128 16-dword pages */
 static void (*irq_handlers[HALF_QUEUES])(void *pdev);
 static void *irq_pdevs[HALF_QUEUES];
 
+#if DEBUG_QMGR
+char qmgr_queue_descs[QUEUES][32];
+#endif
+
 void qmgr_set_irq(unsigned int queue, int src,
                   void (*handler)(void *pdev), void *pdev)
 {
@@ -70,6 +72,7 @@ void qmgr_disable_irq(unsigned int queue)
         spin_lock_irqsave(&qmgr_lock, flags);
         __raw_writel(__raw_readl(&qmgr_regs->irqen[0]) & ~(1 << queue),
                      &qmgr_regs->irqen[0]);
+        __raw_writel(1 << queue, &qmgr_regs->irqstat[0]); /* clear */
         spin_unlock_irqrestore(&qmgr_lock, flags);
 }
 
@@ -81,9 +84,16 @@ static inline void shift_mask(u32 *mask)
         mask[0] <<= 1;
 }
 
+#if DEBUG_QMGR
 int qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
                        unsigned int nearly_empty_watermark,
-                       unsigned int nearly_full_watermark)
+                       unsigned int nearly_full_watermark,
+                       const char *desc_format, const char* name)
+#else
+int __qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
+                         unsigned int nearly_empty_watermark,
+                         unsigned int nearly_full_watermark)
+#endif
 {
         u32 cfg, addr = 0, mask[4]; /* in 16-dwords */
         int err;
@@ -151,12 +161,13 @@ int qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
         used_sram_bitmap[2] |= mask[2];
         used_sram_bitmap[3] |= mask[3];
         __raw_writel(cfg | (addr << 14), &qmgr_regs->sram[queue]);
-        spin_unlock_irq(&qmgr_lock);
-
-#if DEBUG
-        printk(KERN_DEBUG "qmgr: requested queue %i, addr = 0x%02X\n",
-               queue, addr);
+#if DEBUG_QMGR
+        snprintf(qmgr_queue_descs[queue], sizeof(qmgr_queue_descs[0]),
+                 desc_format, name);
+        printk(KERN_DEBUG "qmgr: requested queue %s(%i) addr = 0x%02X\n",
+               qmgr_queue_descs[queue], queue, addr);
 #endif
+        spin_unlock_irq(&qmgr_lock);
         return 0;
 
 err:
@@ -189,6 +200,11 @@ void qmgr_release_queue(unsigned int queue)
         while (addr--)
                 shift_mask(mask);
 
+#if DEBUG_QMGR
+        printk(KERN_DEBUG "qmgr: releasing queue %s(%i)\n",
+               qmgr_queue_descs[queue], queue);
+        qmgr_queue_descs[queue][0] = '\x0';
+#endif
         __raw_writel(0, &qmgr_regs->sram[queue]);
 
         used_sram_bitmap[0] &= ~mask[0];
@@ -199,9 +215,10 @@ void qmgr_release_queue(unsigned int queue)
         spin_unlock_irq(&qmgr_lock);
 
         module_put(THIS_MODULE);
-#if DEBUG
-        printk(KERN_DEBUG "qmgr: released queue %i\n", queue);
-#endif
+
+        while ((addr = qmgr_get_entry(queue)))
+                printk(KERN_ERR "qmgr: released queue %i not empty: 0x%08X\n",
+                       queue, addr);
 }
 
 static int qmgr_init(void)
@@ -272,5 +289,10 @@ EXPORT_SYMBOL(qmgr_regs);
 EXPORT_SYMBOL(qmgr_set_irq);
 EXPORT_SYMBOL(qmgr_enable_irq);
 EXPORT_SYMBOL(qmgr_disable_irq);
+#if DEBUG_QMGR
+EXPORT_SYMBOL(qmgr_queue_descs);
 EXPORT_SYMBOL(qmgr_request_queue);
+#else
+EXPORT_SYMBOL(__qmgr_request_queue);
+#endif
 EXPORT_SYMBOL(qmgr_release_queue);
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 0acd95ecf27e..921c947b5b6b 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -231,7 +231,6 @@ static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
 
 static void __init nas100d_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
         int i;
 
@@ -294,8 +293,8 @@ static void __init nas100d_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "NAS100D: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, nas100d_plat_eth[0].hwaddr));
+        printk(KERN_INFO "NAS100D: Using MAC address %pM for port 0\n",
+               nas100d_plat_eth[0].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index bc9d920ae54f..ff6a08d02cc4 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -220,7 +220,6 @@ static struct sys_timer nslu2_timer = {
 
 static void __init nslu2_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
         int i;
 
@@ -275,8 +274,8 @@ static void __init nslu2_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "NSLU2: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, nslu2_plat_eth[0].hwaddr));
+        printk(KERN_INFO "NSLU2: Using MAC address %pM for port 0\n",
+               nslu2_plat_eth[0].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-pxa/include/mach/palmasoc.h b/arch/arm/mach-pxa/include/mach/palmasoc.h
new file mode 100644
index 000000000000..6c4b1f7de20a
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/palmasoc.h
@@ -0,0 +1,13 @@
+#ifndef _INCLUDE_PALMASOC_H_
+#define _INCLUDE_PALMASOC_H_
+struct palm27x_asoc_info {
+        int     jack_gpio;
+};
+
+#ifdef CONFIG_SND_PXA2XX_SOC_PALM27X
+void __init palm27x_asoc_set_pdata(struct palm27x_asoc_info *data);
+#else
+static inline void palm27x_asoc_set_pdata(struct palm27x_asoc_info *data) {}
+#endif
+
+#endif
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h
index 7b8842cfa5fc..31e6a7b6ad80 100644
--- a/arch/arm/mach-pxa/include/mach/reset.h
+++ b/arch/arm/mach-pxa/include/mach/reset.h
@@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask);
 
 /**
  * init_gpio_reset() - register GPIO as reset generator
- *
- * @gpio - gpio nr
- * @output - set gpio as out/low instead of input during normal work
+ * @gpio: gpio nr
+ * @output: set gpio as out/low instead of input during normal work
  */
 extern int init_gpio_reset(int gpio, int output);
 
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 2df8d9facf57..22c9530e91e2 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/mm.h>
+#include <linux/hardirq.h>
 #include <linux/init.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>