git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
pat.c
diff --git
a/arch/x86/mm/pat.c
b/arch/x86/mm/pat.c
index 64121a18b8cb33902b6161435136aa86b619a152..f6ff57b7efa514e0a7e1ec47ac8472ea868c13fa 100644
(file)
--- a/
arch/x86/mm/pat.c
+++ b/
arch/x86/mm/pat.c
@@
-158,7
+158,7
@@
static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type)
return req_type;
}
-static int pat_pagerange_is_ram(
unsigned long start, unsigned long
end)
+static int pat_pagerange_is_ram(
resource_size_t start, resource_size_t
end)
{
int ram_page = 0, not_rampage = 0;
unsigned long page_nr;