projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess...
[deliverable/linux.git]
/
arch
/
x86
/
mm
/
ioremap.c
diff --git
a/arch/x86/mm/ioremap.c
b/arch/x86/mm/ioremap.c
index f45d5e29a72edf4e15616d48c0d174f7905ac417..433f7bd4648af4206fbc4afb0b2fd6b6dab59b6e 100644
(file)
--- a/
arch/x86/mm/ioremap.c
+++ b/
arch/x86/mm/ioremap.c
@@
-348,7
+348,7
@@
EXPORT_SYMBOL(ioremap_nocache);
*
* Must be freed with iounmap.
*/
*
* Must be freed with iounmap.
*/
-void __iomem *ioremap_wc(
unsigned long
phys_addr, unsigned long size)
+void __iomem *ioremap_wc(
resource_size_t
phys_addr, unsigned long size)
{
if (pat_enabled)
return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
{
if (pat_enabled)
return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
This page took
0.029356 seconds
and
5
git commands to generate.