diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-04-10 18:09:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:54 -0400 |
commit | 4c8337ac425b220594fec45ad6d3ac76d3ce2b90 (patch) | |
tree | 7b70e8908ae7c8ff4305b4c628374f2998366b10 | |
parent | 1a7a34af78923f8807d054a15133a8fcf47e385e (diff) |
x86: fix arch/x86/mm/ioremap.c warning
Fix printk formats in x86/mm/ioremap.c:
next-20080410/arch/x86/mm/ioremap.c:137: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'resource_size_t'
next-20080410/arch/x86/mm/ioremap.c:188: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'resource_size_t'
next-20080410/arch/x86/mm/ioremap.c:188: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/mm/ioremap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index c590fd200e29..3a4baf95e24d 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -134,7 +134,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, | |||
134 | 134 | ||
135 | if (!phys_addr_valid(phys_addr)) { | 135 | if (!phys_addr_valid(phys_addr)) { |
136 | printk(KERN_WARNING "ioremap: invalid physical address %llx\n", | 136 | printk(KERN_WARNING "ioremap: invalid physical address %llx\n", |
137 | phys_addr); | 137 | (unsigned long long)phys_addr); |
138 | WARN_ON_ONCE(1); | 138 | WARN_ON_ONCE(1); |
139 | return NULL; | 139 | return NULL; |
140 | } | 140 | } |
@@ -187,7 +187,8 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, | |||
187 | new_prot_val == _PAGE_CACHE_WB)) { | 187 | new_prot_val == _PAGE_CACHE_WB)) { |
188 | pr_debug( | 188 | pr_debug( |
189 | "ioremap error for 0x%llx-0x%llx, requested 0x%lx, got 0x%lx\n", | 189 | "ioremap error for 0x%llx-0x%llx, requested 0x%lx, got 0x%lx\n", |
190 | phys_addr, phys_addr + size, | 190 | (unsigned long long)phys_addr, |
191 | (unsigned long long)(phys_addr + size), | ||
191 | prot_val, new_prot_val); | 192 | prot_val, new_prot_val); |
192 | free_memtype(phys_addr, phys_addr + size); | 193 | free_memtype(phys_addr, phys_addr + size); |
193 | return NULL; | 194 | return NULL; |