diff options
-rw-r--r-- | arch/parisc/kernel/signal.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/acpi_pm.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/sis/sis900.c | 2 | ||||
-rw-r--r-- | mm/memory-failure.c | 2 | ||||
-rw-r--r-- | sound/pci/ens1370.c | 2 | ||||
-rw-r--r-- | sound/pci/via82xx.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 940188d1942c..35c5bf1307aa 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
@@ -85,7 +85,7 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs) | |||
85 | err |= __copy_from_user(regs->iaoq, sc->sc_iaoq, sizeof(regs->iaoq)); | 85 | err |= __copy_from_user(regs->iaoq, sc->sc_iaoq, sizeof(regs->iaoq)); |
86 | err |= __copy_from_user(regs->iasq, sc->sc_iasq, sizeof(regs->iasq)); | 86 | err |= __copy_from_user(regs->iasq, sc->sc_iasq, sizeof(regs->iasq)); |
87 | err |= __get_user(regs->sar, &sc->sc_sar); | 87 | err |= __get_user(regs->sar, &sc->sc_sar); |
88 | DBG(2,"restore_sigcontext: iaoq is 0x%#lx / 0x%#lx\n", | 88 | DBG(2,"restore_sigcontext: iaoq is %#lx / %#lx\n", |
89 | regs->iaoq[0],regs->iaoq[1]); | 89 | regs->iaoq[0],regs->iaoq[1]); |
90 | DBG(2,"restore_sigcontext: r28 is %ld\n", regs->gr[28]); | 90 | DBG(2,"restore_sigcontext: r28 is %ld\n", regs->gr[28]); |
91 | return err; | 91 | return err; |
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 6efe4d1ab3aa..6eab88985670 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
@@ -200,14 +200,14 @@ static int __init init_acpi_pm_clocksource(void) | |||
200 | if ((value2 < value1) && ((value2) < 0xFFF)) | 200 | if ((value2 < value1) && ((value2) < 0xFFF)) |
201 | break; | 201 | break; |
202 | printk(KERN_INFO "PM-Timer had inconsistent results:" | 202 | printk(KERN_INFO "PM-Timer had inconsistent results:" |
203 | " 0x%#llx, 0x%#llx - aborting.\n", | 203 | " %#llx, %#llx - aborting.\n", |
204 | value1, value2); | 204 | value1, value2); |
205 | pmtmr_ioport = 0; | 205 | pmtmr_ioport = 0; |
206 | return -EINVAL; | 206 | return -EINVAL; |
207 | } | 207 | } |
208 | if (i == ACPI_PM_READ_CHECKS) { | 208 | if (i == ACPI_PM_READ_CHECKS) { |
209 | printk(KERN_INFO "PM-Timer failed consistency check " | 209 | printk(KERN_INFO "PM-Timer failed consistency check " |
210 | " (0x%#llx) - aborting.\n", value1); | 210 | " (%#llx) - aborting.\n", value1); |
211 | pmtmr_ioport = 0; | 211 | pmtmr_ioport = 0; |
212 | return -ENODEV; | 212 | return -ENODEV; |
213 | } | 213 | } |
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index eb4aea3fe793..6c1e34cd8ae5 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c | |||
@@ -1723,7 +1723,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance) | |||
1723 | 1723 | ||
1724 | if(netif_msg_intr(sis_priv)) | 1724 | if(netif_msg_intr(sis_priv)) |
1725 | printk(KERN_DEBUG "%s: exiting interrupt, " | 1725 | printk(KERN_DEBUG "%s: exiting interrupt, " |
1726 | "interrupt status = 0x%#8.8x.\n", | 1726 | "interrupt status = %#8.8x\n", |
1727 | net_dev->name, sr32(isr)); | 1727 | net_dev->name, sr32(isr)); |
1728 | 1728 | ||
1729 | spin_unlock (&sis_priv->lock); | 1729 | spin_unlock (&sis_priv->lock); |
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 2c13aa7a0164..b6fefcf13cba 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
@@ -1265,7 +1265,7 @@ void memory_failure_queue(unsigned long pfn, int trapno, int flags) | |||
1265 | if (kfifo_put(&mf_cpu->fifo, &entry)) | 1265 | if (kfifo_put(&mf_cpu->fifo, &entry)) |
1266 | schedule_work_on(smp_processor_id(), &mf_cpu->work); | 1266 | schedule_work_on(smp_processor_id(), &mf_cpu->work); |
1267 | else | 1267 | else |
1268 | pr_err("Memory failure: buffer overflow when queuing memory failure at 0x%#lx\n", | 1268 | pr_err("Memory failure: buffer overflow when queuing memory failure at %#lx\n", |
1269 | pfn); | 1269 | pfn); |
1270 | spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); | 1270 | spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); |
1271 | put_cpu_var(memory_failure_cpu); | 1271 | put_cpu_var(memory_failure_cpu); |
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index ca8929b9a5d6..61262f396004 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -1842,7 +1842,7 @@ static int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev) | |||
1842 | 1842 | ||
1843 | default: | 1843 | default: |
1844 | if (!request_region(io_port, 8, "ens137x: gameport")) { | 1844 | if (!request_region(io_port, 8, "ens137x: gameport")) { |
1845 | printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n", | 1845 | printk(KERN_WARNING "ens137x: gameport io port %#x in use\n", |
1846 | io_port); | 1846 | io_port); |
1847 | return -EBUSY; | 1847 | return -EBUSY; |
1848 | } | 1848 | } |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 3c511d0caf9e..5ae6f042c586 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -1940,7 +1940,7 @@ static int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legac | |||
1940 | 1940 | ||
1941 | r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport"); | 1941 | r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport"); |
1942 | if (!r) { | 1942 | if (!r) { |
1943 | printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n", | 1943 | printk(KERN_WARNING "via82xx: cannot reserve joystick port %#x\n", |
1944 | JOYSTICK_ADDR); | 1944 | JOYSTICK_ADDR); |
1945 | return -EBUSY; | 1945 | return -EBUSY; |
1946 | } | 1946 | } |