diff --git a/[refs] b/[refs] index dce05448358b..483fc2fe4661 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f8afb77cd8a672f024e4a16763ef177bc16c8f8 +refs/heads/master: 3709c857350976408953831f0cf89d19951394a1 diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c index acc15b23b743..03b48c80c651 100644 --- a/trunk/arch/x86/mm/pat.c +++ b/trunk/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;