[PATCH] acpi_pm: re-fix printk format (was: timer updates for2.6.27)

From: Randy Dunlap
Date: Tue Jul 15 2008 - 15:01:26 EST


From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Re-fix printk format warning in acpi_pm clocksource.

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
---
drivers/clocksource/acpi_pm.c | 6 +++---
include/linux/acpi_pmtmr.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

[still looking for penance task]

--- linhead.orig/drivers/clocksource/acpi_pm.c
+++ linhead/drivers/clocksource/acpi_pm.c
@@ -28,7 +28,7 @@
* The location is detected during setup_arch(),
* in arch/i386/kernel/acpi/boot.c
*/
-u32 pmtmr_ioport __read_mostly;
+unsigned long pmtmr_ioport __read_mostly;

static inline u32 read_pmtmr(void)
{
@@ -227,8 +227,8 @@ static int __init parse_pmtmr(char *arg)
if (strict_strtoul(arg, 16, &base))
return -EINVAL;

- printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
- (unsigned int)pmtmr_ioport, base);
+ printk(KERN_INFO "PMTMR IOPort override: 0x%04lx -> 0x%04lx\n",
+ pmtmr_ioport, base);
pmtmr_ioport = base;

return 1;
--- linhead.orig/include/linux/acpi_pmtmr.h
+++ linhead/include/linux/acpi_pmtmr.h
@@ -15,7 +15,7 @@
#ifdef CONFIG_X86_PM_TIMER

extern u32 acpi_pm_read_verified(void);
-extern u32 pmtmr_ioport;
+extern unsigned long pmtmr_ioport;

static inline u32 acpi_pm_read_early(void)
{





---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/