diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-13 00:18:31 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 18:23:59 +0200 |
commit | 685143ac1f7a579a3fac9c7f2ac8f82e95af6864 (patch) | |
tree | 0fb1ff8fecb7e21593c022ff458b8db6096d6da5 /kernel/resource.c | |
parent | [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers (diff) | |
download | linux-685143ac1f7a579a3fac9c7f2ac8f82e95af6864.tar.xz linux-685143ac1f7a579a3fac9c7f2ac8f82e95af6864.zip |
[PATCH] 64bit resource: fix up printks for resources in arch and core code
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> and
Andrew Morton.
(tweaked by Andy Isaacson <adi@hexapodia.org>)
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andy Isaacson <adi@hexapodia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/resource.c')
-rw-r--r-- | kernel/resource.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index e3080fcc66a3..ea5f7811a408 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -83,10 +83,10 @@ static int r_show(struct seq_file *m, void *v) for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent) if (p->parent == root) break; - seq_printf(m, "%*s%0*lx-%0*lx : %s\n", + seq_printf(m, "%*s%0*llx-%0*llx : %s\n", depth * 2, "", - width, r->start, - width, r->end, + width, (unsigned long long) r->start, + width, (unsigned long long) r->end, r->name ? r->name : "<BAD>"); return 0; } @@ -511,7 +511,9 @@ void __release_region(struct resource *parent, unsigned long start, unsigned lon write_unlock(&resource_lock); - printk(KERN_WARNING "Trying to free nonexistent resource <%08lx-%08lx>\n", start, end); + printk(KERN_WARNING "Trying to free nonexistent resource " + "<%016llx-%016llx>\n", (unsigned long long)start, + (unsigned long long)end); } EXPORT_SYMBOL(__release_region); |