public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>, Andrew Morton <akpm@osdl.org>
Subject: [PATCH 5/17] [PATCH] 64bit resource: fix up printks for resources in mtd drivers
Date: Tue, 27 Jun 2006 09:33:41 -0700	[thread overview]
Message-ID: <11514260483754-git-send-email-greg@kroah.com> (raw)
In-Reply-To: <11514260442539-git-send-email-greg@kroah.com>

From: Greg Kroah-Hartman <gregkh@suse.de>

This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>

Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/mtd/devices/pmc551.c       |    8 ++++----
 drivers/mtd/maps/amd76xrom.c       |    5 +++--
 drivers/mtd/maps/ichxrom.c         |    5 +++--
 drivers/mtd/maps/scx200_docflash.c |    5 +++--
 drivers/mtd/maps/sun_uflash.c      |    5 +++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index 666cce1..ce2a233 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -551,11 +551,11 @@ #ifdef CONFIG_MTD_PMC551_DEBUG
         /*
          * Some screen fun
          */
-        printk(KERN_DEBUG "pmc551: %d%c (0x%x) of %sprefetchable memory at 0x%lx\n",
+        printk(KERN_DEBUG "pmc551: %d%c (0x%x) of %sprefetchable memory at 0x%llx\n",
 	       (size<1024)?size:(size<1048576)?size>>10:size>>20,
                (size<1024)?'B':(size<1048576)?'K':'M',
 	       size, ((dcmd&(0x1<<3)) == 0)?"non-":"",
-               (dev->resource[0].start)&PCI_BASE_ADDRESS_MEM_MASK );
+               (unsigned long long)((dev->resource[0].start)&PCI_BASE_ADDRESS_MEM_MASK));
 
         /*
          * Check to see the state of the memory
@@ -685,8 +685,8 @@ static int __init init_pmc551(void)
                         break;
                 }
 
-                printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%lX\n",
-				    PCI_Device->resource[0].start);
+                printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%llx\n",
+				    (unsigned long long)PCI_Device->resource[0].start);
 
                 /*
                  * The PMC551 device acts VERY weird if you don't init it
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index c350878..a505870 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -123,9 +123,10 @@ static int __devinit amd76xrom_init_one 
 		window->rsrc.parent = NULL;
 		printk(KERN_ERR MOD_NAME
 			" %s(): Unable to register resource"
-			" 0x%.08lx-0x%.08lx - kernel bug?\n",
+			" 0x%.16llx-0x%.16llx - kernel bug?\n",
 			__func__,
-			window->rsrc.start, window->rsrc.end);
+			(unsigned long long)window->rsrc.start,
+			(unsigned long long)window->rsrc.end);
 	}
 
 #if 0
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index ea50737..1673279 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -177,9 +177,10 @@ static int __devinit ichxrom_init_one (s
 		window->rsrc.parent = NULL;
 		printk(KERN_DEBUG MOD_NAME
 			": %s(): Unable to register resource"
-			" 0x%.08lx-0x%.08lx - kernel bug?\n",
+			" 0x%.16llx-0x%.16llx - kernel bug?\n",
 			__func__,
-			window->rsrc.start, window->rsrc.end);
+			(unsigned long long)window->rsrc.start,
+			(unsigned long long)window->rsrc.end);
 	}
 
 	/* Map the firmware hub into my address space. */
diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index 28b8a57..331a158 100644
--- a/drivers/mtd/maps/scx200_docflash.c
+++ b/drivers/mtd/maps/scx200_docflash.c
@@ -164,8 +164,9 @@ static int __init init_scx200_docflash(v
 		outl(pmr, scx200_cb_base + SCx200_PMR);
 	}
 
-       	printk(KERN_INFO NAME ": DOCCS mapped at 0x%lx-0x%lx, width %d\n",
-	       docmem.start, docmem.end, width);
+       	printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",
+			(unsigned long long)docmem.start,
+			(unsigned long long)docmem.end, width);
 
 	scx200_docflash_map.size = size;
 	if (width == 8)
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 24a0315..4db2055 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -62,9 +62,10 @@ int uflash_devinit(struct linux_ebus_dev
 		/* Non-CFI userflash device-- once I find one we
 		 * can work on supporting it.
 		 */
-		printk("%s: unsupported device at 0x%lx (%d regs): " \
+		printk("%s: unsupported device at 0x%llx (%d regs): " \
 			"email ebrower@usa.net\n",
-		       dp->full_name, res->start, edev->num_addrs);
+		       dp->full_name, (unsigned long long)res->start,
+		       edev->num_addrs);
 
 		return -ENODEV;
 	}
-- 
1.4.0


  reply	other threads:[~2006-06-27 16:40 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-27 16:33 [GIT PATCH] 64bit resource patches for 2.6.17 Greg KH
2006-06-27 16:33 ` [PATCH 1/17] [PATCH] 64bit resource: C99 changes for struct resource declarations Greg KH
2006-06-27 16:33   ` [PATCH 2/17] [PATCH] 64bit resource: fix up printks for resources in sound drivers Greg KH
2006-06-27 16:33     ` [PATCH 3/17] [PATCH] 64bit resource: fix up printks for resources in networks drivers Greg KH
2006-06-27 16:33       ` [PATCH 4/17] [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers Greg KH
2006-06-27 16:33         ` Greg KH [this message]
2006-06-27 16:33           ` [PATCH 6/17] [PATCH] 64bit resource: fix up printks for resources in ide drivers Greg KH
2006-06-27 16:33             ` [PATCH 7/17] [PATCH] 64bit resource: fix up printks for resources in video drivers Greg KH
2006-06-27 16:33               ` [PATCH 8/17] [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers Greg KH
2006-06-27 16:33                 ` [PATCH 9/17] [PATCH] 64bit resource: fix up printks for resources in arch and core code Greg KH
2006-06-27 16:33                   ` [PATCH 10/17] [PATCH] 64bit resource: fix up printks for resources in misc drivers Greg KH
2006-06-27 16:33                     ` [PATCH 11/17] [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource Greg KH
2006-06-27 16:33                       ` [PATCH 12/17] [PATCH] 64bit resource: change resource core to use resource_size_t Greg KH
2006-06-27 16:33                         ` [PATCH 13/17] [PATCH] 64bit resource: change pci core and arch code " Greg KH
2006-06-27 16:33                           ` [PATCH 14/17] [PATCH] 64bit resource: change pnp core " Greg KH
2006-06-27 16:33                             ` [PATCH 15/17] [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed Greg KH
2006-06-27 16:33                               ` [PATCH 16/17] [PATCH] 64bit Resource: finally enable 64bit resource sizes Greg KH
2006-06-27 16:33                                 ` [PATCH 17/17] [PATCH] i386: export memory more than 4G through /proc/iomem Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11514260483754-git-send-email-greg@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@osdl.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox