16 files changed, 92 insertions, 73 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 12de1fdaa6c6..9364dc554257 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2847,7 +2847,7 @@ static void do_cciss_request(struct request_queue *q)
                 h->maxSG = seg;
 
 #ifdef CCISS_DEBUG
-        printk(KERN_DEBUG "cciss: Submitting %d sectors in %d segments\n",
+        printk(KERN_DEBUG "cciss: Submitting %lu sectors in %d segments\n",
                creq->nr_sectors, seg);
 #endif                          /* CCISS_DEBUG */
 
@@ -3197,7 +3197,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 
         c->paddr = pci_resource_start(pdev, 0); /* addressing mode bits already removed */
 #ifdef CCISS_DEBUG
-        printk("address 0 = %x\n", c->paddr);
+        printk("address 0 = %lx\n", c->paddr);
 #endif                          /* CCISS_DEBUG */
         c->vaddr = remap_pci_mem(c->paddr, 0x250);
 
@@ -3224,7 +3224,8 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 #endif                          /* CCISS_DEBUG */
         cfg_base_addr_index = find_PCI_BAR_index(pdev, cfg_base_addr);
 #ifdef CCISS_DEBUG
-        printk("cfg base address index = %x\n", cfg_base_addr_index);
+        printk("cfg base address index = %llx\n",
+                (unsigned long long)cfg_base_addr_index);
 #endif                          /* CCISS_DEBUG */
         if (cfg_base_addr_index == -1) {
                 printk(KERN_WARNING "cciss: Cannot find cfg_base_addr_index\n");
@@ -3234,7 +3235,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 
         cfg_offset = readl(c->vaddr + SA5_CTMEM_OFFSET);
 #ifdef CCISS_DEBUG
-        printk("cfg offset = %x\n", cfg_offset);
+        printk("cfg offset = %llx\n", (unsigned long long)cfg_offset);
 #endif                          /* CCISS_DEBUG */
         c->cfgtable = remap_pci_mem(pci_resource_start(pdev,
                                                        cfg_base_addr_index) +
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index faa1cc66e9cf..82020abc329e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1134,7 +1134,7 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                         continue;
 
                 is_out = test_bit(FLAG_IS_OUT, &gdesc->flags);
-                seq_printf(s, " gpio-%-3d (%-12s) %s %s",
+                seq_printf(s, " gpio-%-3d (%-20.20s) %s %s",
                         gpio, gdesc->label,
                         is_out ? "out" : "in ",
                         chip->get
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 488e45cd43d7..f7dce8b9f64b 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -128,6 +128,9 @@ static const char* temperature_sensors_sets[][36] = {
 /* Set 13: iMac 8,1 */
         { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
           "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL },
+/* Set 14: iMac 6,1 */
+        { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
+          "TO0P", "Tp0P", NULL },
 };
 
 /* List of keys used to read/write fan speeds */
@@ -1296,6 +1299,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
         { .accelerometer = 1, .light = 1, .temperature_set = 12 },
 /* iMac 8: light sensor only, temperature set 13 */
         { .accelerometer = 0, .light = 0, .temperature_set = 13 },
+/* iMac 6: light sensor only, temperature set 14 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 14 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1349,10 +1354,18 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
                 &applesmc_dmi_data[4]},
+        { applesmc_dmi_match, "Apple MacPro", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },
+                &applesmc_dmi_data[4]},
         { applesmc_dmi_match, "Apple iMac 8", {
           DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },
                 &applesmc_dmi_data[13]},
+        { applesmc_dmi_match, "Apple iMac 6", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "iMac6") },
+                &applesmc_dmi_data[14]},
         { applesmc_dmi_match, "Apple iMac 5", {
           DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") },
diff --git a/drivers/misc/sgi-gru/Makefile b/drivers/misc/sgi-gru/Makefile
index d03597a521b0..9e9170b3599a 100644
--- a/drivers/misc/sgi-gru/Makefile
+++ b/drivers/misc/sgi-gru/Makefile
@@ -1,3 +1,7 @@
+ifdef CONFIG_SGI_GRU_DEBUG
+  EXTRA_CFLAGS  += -DDEBUG
+endif
+
 obj-$(CONFIG_SGI_GRU) := gru.o
 gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o
 
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 209b4a464bcf..855f389eea40 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -36,7 +36,7 @@ if PARPORT
 config PARPORT_PC
         tristate "PC-style hardware"
         depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && \
-                (!M68K || ISA) && !MN10300 && !AVR32
+                (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN
         ---help---
           You should say Y here if you have a PC-style parallel port. All
           IBM PC compatible computers and some Alphas have PC-style
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index dae87b1a4c6e..cf12f2d84be2 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -352,21 +352,21 @@ static int map_dma_buffers(struct driver_data *drv_data)
         } else
                 drv_data->tx_map_len = drv_data->len;
 
-        /* Stream map the rx buffer */
-        drv_data->rx_dma = dma_map_single(dev, drv_data->rx,
-                                                drv_data->rx_map_len,
-                                                DMA_FROM_DEVICE);
-        if (dma_mapping_error(dev, drv_data->rx_dma))
-                return 0;
-
-        /* Stream map the tx buffer */
+        /* Stream map the tx buffer. Always do DMA_TO_DEVICE first
+         * so we flush the cache *before* invalidating it, in case
+         * the tx and rx buffers overlap.
+         */
         drv_data->tx_dma = dma_map_single(dev, drv_data->tx,
-                                                drv_data->tx_map_len,
-                                                DMA_TO_DEVICE);
+                                        drv_data->tx_map_len, DMA_TO_DEVICE);
+        if (dma_mapping_error(dev, drv_data->tx_dma))
+                return 0;
 
-        if (dma_mapping_error(dev, drv_data->tx_dma)) {
-                dma_unmap_single(dev, drv_data->rx_dma,
+        /* Stream map the rx buffer */
+        drv_data->rx_dma = dma_map_single(dev, drv_data->rx,
                                         drv_data->rx_map_len, DMA_FROM_DEVICE);
+        if (dma_mapping_error(dev, drv_data->rx_dma)) {
+                dma_unmap_single(dev, drv_data->tx_dma,
+                                        drv_data->tx_map_len, DMA_TO_DEVICE);
                 return 0;
         }
 
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 61ba147e384d..0b4db0ce78d6 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -506,20 +506,6 @@ static int map_dma_buffers(struct driver_data *drv_data)
         if (!IS_DMA_ALIGNED(drv_data->rx) || !IS_DMA_ALIGNED(drv_data->tx))
                 return -1;
 
-        /* NULL rx means write-only transfer and no map needed
-           since rx DMA will not be used */
-        if (drv_data->rx) {
-                buf = drv_data->rx;
-                drv_data->rx_dma = dma_map_single(
-                                        dev,
-                                        buf,
-                                        drv_data->len,
-                                        DMA_FROM_DEVICE);
-                if (dma_mapping_error(dev, drv_data->rx_dma))
-                        return -1;
-                drv_data->rx_dma_needs_unmap = 1;
-        }
-
         if (drv_data->tx == NULL) {
                 /* Read only message --> use drv_data->dummy_dma_buf for dummy
                    writes to achive reads */
@@ -533,18 +519,31 @@ static int map_dma_buffers(struct driver_data *drv_data)
                                         buf,
                                         drv_data->tx_map_len,
                                         DMA_TO_DEVICE);
-        if (dma_mapping_error(dev, drv_data->tx_dma)) {
-                if (drv_data->rx_dma) {
-                        dma_unmap_single(dev,
-                                        drv_data->rx_dma,
-                                        drv_data->len,
-                                        DMA_FROM_DEVICE);
-                        drv_data->rx_dma_needs_unmap = 0;
-                }
+        if (dma_mapping_error(dev, drv_data->tx_dma))
                 return -1;
-        }
         drv_data->tx_dma_needs_unmap = 1;
 
+        /* NULL rx means write-only transfer and no map needed
+         * since rx DMA will not be used */
+        if (drv_data->rx) {
+                buf = drv_data->rx;
+                drv_data->rx_dma = dma_map_single(dev,
+                                                buf,
+                                                drv_data->len,
+                                                DMA_FROM_DEVICE);
+                if (dma_mapping_error(dev, drv_data->rx_dma)) {
+                        if (drv_data->tx_dma) {
+                                dma_unmap_single(dev,
+                                                drv_data->tx_dma,
+                                                drv_data->tx_map_len,
+                                                DMA_TO_DEVICE);
+                                drv_data->tx_dma_needs_unmap = 0;
+                        }
+                        return -1;
+                }
+                drv_data->rx_dma_needs_unmap = 1;
+        }
+
         return 0;
 }
 
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index f8d0a57a07cb..9a577a800db5 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -132,7 +132,7 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
 
         bl = backlight_device_register("backlight", &sinfo->pdev->dev,
                         sinfo, &atmel_lcdc_bl_ops);
-        if (IS_ERR(sinfo->backlight)) {
+        if (IS_ERR(bl)) {
                 dev_err(&sinfo->pdev->dev, "error %ld on backlight register\n",
                                 PTR_ERR(bl));
                 return;
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x.c
index 242c38250166..93bb4340cc64 100644
--- a/drivers/video/backlight/da903x.c
+++ b/drivers/video/backlight/da903x.c
@@ -119,6 +119,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
         default:
                 dev_err(&pdev->dev, "invalid backlight device ID(%d)\n",
                                 pdev->id);
+                kfree(data);
                 return -EINVAL;
         }
 
@@ -130,6 +131,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
                         data, &da903x_backlight_ops);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
+                kfree(data);
                 return PTR_ERR(bl);
         }
 
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 8e1731d3b228..680e57b616cd 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -42,10 +42,13 @@ static int fb_notifier_callback(struct notifier_block *self,
 
         mutex_lock(&ld->ops_lock);
         if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info)) {
-                if (event == FB_EVENT_BLANK)
-                        ld->ops->set_power(ld, *(int *)evdata->data);
-                else
-                        ld->ops->set_mode(ld, evdata->data);
+                if (event == FB_EVENT_BLANK) {
+                        if (ld->ops->set_power)
+                                ld->ops->set_power(ld, *(int *)evdata->data);
+                } else {
+                        if (ld->ops->set_mode)
+                                ld->ops->set_mode(ld, evdata->data);
+                }
         }
         mutex_unlock(&ld->ops_lock);
         return 0;
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 8a8760230bc7..a2aa6ddffbe2 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2462,8 +2462,7 @@ static int __init cirrusfb_init(void)
 
 #ifndef MODULE
 static int __init cirrusfb_setup(char *options) {
-        char *this_opt, s[32];
-        int i;
+        char *this_opt;
 
         DPRINTK("ENTER\n");
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 1d5ae39cb271..3c65b0d67617 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -230,7 +230,7 @@ static void fb_set_logo_directpalette(struct fb_info *info,
         greenshift = info->var.green.offset;
         blueshift = info->var.blue.offset;
 
-        for (i = 32; i < logo->clutsize; i++)
+        for (i = 32; i < 32 + logo->clutsize; i++)
                 palette[i] = i << redshift | i << greenshift | i << blueshift;
 }
 
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 2a380011e9ba..7baf2dd12d50 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -222,6 +222,9 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)
         unsigned int bbisc = tmio_ioread16(par->lcr + LCR_BBISC);
 
 
+        tmio_iowrite16(bbisc, par->lcr + LCR_BBISC);
+
+#ifdef CONFIG_FB_TMIO_ACCELL
         /*
          * We were in polling mode and now we got correct irq.
          * Switch back to IRQ-based sync of command FIFO
@@ -231,9 +234,6 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)
                 par->use_polling = false;
         }
 
-        tmio_iowrite16(bbisc, par->lcr + LCR_BBISC);
-
-#ifdef CONFIG_FB_TMIO_ACCELL
         if (bbisc & 1)
                 wake_up(&par->wait_acc);
 #endif
@@ -938,7 +938,9 @@ static void tmiofb_dump_regs(struct platform_device *dev)
 static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct fb_info *info = platform_get_drvdata(dev);
+#ifdef CONFIG_FB_TMIO_ACCELL
         struct tmiofb_par *par = info->par;
+#endif
         struct mfd_cell *cell = dev->dev.platform_data;
         int retval = 0;
 
@@ -950,12 +952,14 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
                 info->fbops->fb_sync(info);
 
 
+#ifdef CONFIG_FB_TMIO_ACCELL
         /*
          * The fb should be usable even if interrupts are disabled (and they are
          * during suspend/resume). Switch temporary to forced polling.
          */
         printk(KERN_INFO "tmiofb: switching to polling\n");
         par->use_polling = true;
+#endif
         tmiofb_hw_stop(dev);
 
         if (cell->suspend)
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 0132eae06f55..73ac754ad801 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2036,30 +2036,30 @@ static int viafb_vt1636_proc_write(struct file *file,
         return count;
 }
 
-static void viafb_init_proc(struct proc_dir_entry *viafb_entry)
+static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
 {
         struct proc_dir_entry *entry;
-        viafb_entry = proc_mkdir("viafb", NULL);
+        *viafb_entry = proc_mkdir("viafb", NULL);
         if (viafb_entry) {
-                entry = create_proc_entry("dvp0", 0, viafb_entry);
+                entry = create_proc_entry("dvp0", 0, *viafb_entry);
                 if (entry) {
                         entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dvp0_proc_read;
                         entry->write_proc = viafb_dvp0_proc_write;
                 }
-                entry = create_proc_entry("dvp1", 0, viafb_entry);
+                entry = create_proc_entry("dvp1", 0, *viafb_entry);
                 if (entry) {
                         entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dvp1_proc_read;
                         entry->write_proc = viafb_dvp1_proc_write;
                 }
-                entry = create_proc_entry("dfph", 0, viafb_entry);
+                entry = create_proc_entry("dfph", 0, *viafb_entry);
                 if (entry) {
                         entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dfph_proc_read;
                         entry->write_proc = viafb_dfph_proc_write;
                 }
-                entry = create_proc_entry("dfpl", 0, viafb_entry);
+                entry = create_proc_entry("dfpl", 0, *viafb_entry);
                 if (entry) {
                         entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dfpl_proc_read;
@@ -2068,7 +2068,7 @@ static void viafb_init_proc(struct proc_dir_entry *viafb_entry)
                 if (VT1636_LVDS == viaparinfo->chip_info->lvds_chip_info.
                         lvds_chip_name || VT1636_LVDS ==
                     viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
-                        entry = create_proc_entry("vt1636", 0, viafb_entry);
+                        entry = create_proc_entry("vt1636", 0, *viafb_entry);
                         if (entry) {
                                 entry->owner = THIS_MODULE;
                                 entry->read_proc = viafb_vt1636_proc_read;
@@ -2087,6 +2087,7 @@ static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)
         remove_proc_entry("dfpl", viafb_entry);
         remove_proc_entry("vt1636", viafb_entry);
         remove_proc_entry("vt1625", viafb_entry);
+        remove_proc_entry("viafb", NULL);
 }
 
 static int __devinit via_pci_probe(void)
@@ -2348,7 +2349,7 @@ static int __devinit via_pci_probe(void)
                   viafbinfo->node, viafbinfo->fix.id, default_var.xres,
                   default_var.yres, default_var.bits_per_pixel);
 
-        viafb_init_proc(viaparinfo->proc_entry);
+        viafb_init_proc(&viaparinfo->proc_entry);
         viafb_init_dac(IGA2);
         return 0;
 }
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 1295625c4825..c973889110c8 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -86,8 +86,8 @@ static struct platform_driver omap_hdq_driver = {
 static u8 omap_w1_read_byte(void *_hdq);
 static void omap_w1_write_byte(void *_hdq, u8 byte);
 static u8 omap_w1_reset_bus(void *_hdq);
-static void omap_w1_search_bus(void *_hdq, u8 search_type,
-        w1_slave_found_callback slave_found);
+static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
+                u8 search_type, w1_slave_found_callback slave_found);
 
 
 static struct w1_bus_master omap_w1_master = {
@@ -231,8 +231,8 @@ static u8 omap_w1_reset_bus(void *_hdq)
 }
 
 /* W1 search callback function */
-static void omap_w1_search_bus(void *_hdq, u8 search_type,
-        w1_slave_found_callback slave_found)
+static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
+                u8 search_type, w1_slave_found_callback slave_found)
 {
         u64 module_id, rn_le, cs, id;
 
@@ -249,7 +249,7 @@ static void omap_w1_search_bus(void *_hdq, u8 search_type,
         cs = w1_calc_crc8((u8 *)&rn_le, 7);
         id = (cs << 56) | module_id;
 
-        slave_found(_hdq, id);
+        slave_found(master_dev, id);
 }
 
 static int _omap_hdq_reset(struct hdq_data *hdq_data)
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index a0fb5eac407c..526c191e84ea 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -122,14 +122,7 @@ static struct timer_list balloon_timer;
 static void scrub_page(struct page *page)
 {
 #ifdef CONFIG_XEN_SCRUB_PAGES
-        if (PageHighMem(page)) {
-                void *v = kmap(page);
-                clear_page(v);
-                kunmap(v);
-        } else {
-                void *v = page_address(page);
-                clear_page(v);
-        }
+        clear_highpage(page);
 #endif
 }