git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: fix set_fixmap to use phys_addr_t
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
ioremap.c
diff --git
a/arch/x86/mm/ioremap.c
b/arch/x86/mm/ioremap.c
index
0dfa09d
..
09daebf
100644
(file)
--- a/
arch/x86/mm/ioremap.c
+++ b/
arch/x86/mm/ioremap.c
@@
-547,7
+547,7
@@
void __init early_ioremap_reset(void)
}
static void __init __early_set_fixmap(enum fixed_addresses idx,
}
static void __init __early_set_fixmap(enum fixed_addresses idx,
-
unsigned long
phys, pgprot_t flags)
+
phys_addr_t
phys, pgprot_t flags)
{
unsigned long addr = __fix_to_virt(idx);
pte_t *pte;
{
unsigned long addr = __fix_to_virt(idx);
pte_t *pte;
@@
-566,7
+566,7
@@
static void __init __early_set_fixmap(enum fixed_addresses idx,
}
static inline void __init early_set_fixmap(enum fixed_addresses idx,
}
static inline void __init early_set_fixmap(enum fixed_addresses idx,
-
unsigned long
phys, pgprot_t prot)
+
phys_addr_t
phys, pgprot_t prot)
{
if (after_paging_init)
__set_fixmap(idx, phys, prot);
{
if (after_paging_init)
__set_fixmap(idx, phys, prot);
@@
-607,9
+607,10
@@
static int __init check_early_ioremap_leak(void)
late_initcall(check_early_ioremap_leak);
static void __init __iomem *
late_initcall(check_early_ioremap_leak);
static void __init __iomem *
-__early_ioremap(
unsigned long
phys_addr, unsigned long size, pgprot_t prot)
+__early_ioremap(
resource_size_t
phys_addr, unsigned long size, pgprot_t prot)
{
{
- unsigned long offset, last_addr;
+ unsigned long offset;
+ resource_size_t last_addr;
unsigned int nrpages;
enum fixed_addresses idx0, idx;
int i, slot;
unsigned int nrpages;
enum fixed_addresses idx0, idx;
int i, slot;
@@
-625,15
+626,15
@@
__early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)
}
if (slot < 0) {
}
if (slot < 0) {
- printk(KERN_INFO "early_iomap(%08lx, %08lx) not found slot\n",
- phys_addr, size);
+ printk(KERN_INFO "early_iomap(%08l
l
x, %08lx) not found slot\n",
+
(u64)
phys_addr, size);
WARN_ON(1);
return NULL;
}
if (early_ioremap_debug) {
WARN_ON(1);
return NULL;
}
if (early_ioremap_debug) {
- printk(KERN_INFO "early_ioremap(%08lx, %08lx) [%d] => ",
- phys_addr, size, slot);
+ printk(KERN_INFO "early_ioremap(%08l
l
x, %08lx) [%d] => ",
+
(u64)
phys_addr, size, slot);
dump_stack();
}
dump_stack();
}
@@
-680,13
+681,15
@@
__early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)
}
/* Remap an IO device */
}
/* Remap an IO device */
-void __init __iomem *early_ioremap(unsigned long phys_addr, unsigned long size)
+void __init __iomem *
+early_ioremap(resource_size_t phys_addr, unsigned long size)
{
return __early_ioremap(phys_addr, size, PAGE_KERNEL_IO);
}
/* Remap memory */
{
return __early_ioremap(phys_addr, size, PAGE_KERNEL_IO);
}
/* Remap memory */
-void __init __iomem *early_memremap(unsigned long phys_addr, unsigned long size)
+void __init __iomem *
+early_memremap(resource_size_t phys_addr, unsigned long size)
{
return __early_ioremap(phys_addr, size, PAGE_KERNEL);
}
{
return __early_ioremap(phys_addr, size, PAGE_KERNEL);
}