From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762402AbYGOTBZ (ORCPT ); Tue, 15 Jul 2008 15:01:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758622AbYGOTBP (ORCPT ); Tue, 15 Jul 2008 15:01:15 -0400 Received: from rgminet01.oracle.com ([148.87.113.118]:49330 "EHLO rgminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758237AbYGOTBO (ORCPT ); Tue, 15 Jul 2008 15:01:14 -0400 Date: Tue, 15 Jul 2008 11:59:51 -0700 From: Randy Dunlap To: Linus Torvalds Cc: Thomas Gleixner , LKML , Ingo Molnar , Andrew Morton Subject: [PATCH] acpi_pm: re-fix printk format (was: timer updates for 2.6.27) Message-Id: <20080715115951.95f7917d.randy.dunlap@oracle.com> In-Reply-To: References: Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAQAAAAI= X-Brightmail-Tracker: AAAAAQAAAAI= X-Whitelist: TRUE X-Whitelist: TRUE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap Re-fix printk format warning in acpi_pm clocksource. Signed-off-by: Randy Dunlap --- 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/