diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:17:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:17:52 -0700 |
| commit | 9faa1e5942fd647b0dd2fbbdcc04988841cacaf3 (patch) | |
| tree | 3a2e467b04b7e66c9ef233e8c8b286278ef79adf /arch/x86/mm/pat.c | |
| parent | d9a73c00161f3eaa4c8c035c62f45afd1549e38a (diff) | |
| parent | 3709c857350976408953831f0cf89d19951394a1 (diff) | |
| download | blackbird-op-linux-9faa1e5942fd647b0dd2fbbdcc04988841cacaf3.tar.gz blackbird-op-linux-9faa1e5942fd647b0dd2fbbdcc04988841cacaf3.zip | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Ioremap: fix wrong physical address handling in PAT code
x86, tlb: Clean up and correct used type
x86, iomap: Fix wrong page aligned size calculation in ioremapping code
x86, mm: Create symbolic index into address_markers array
x86, ioremap: Fix normal ram range check
x86, ioremap: Fix incorrect physical address handling in PAE mode
x86-64, mm: Initialize VDSO earlier on 64 bits
x86, kmmio/mmiotrace: Fix double free of kmmio_fault_pages
Diffstat (limited to 'arch/x86/mm/pat.c')
| -rw-r--r-- | arch/x86/mm/pat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 64121a18b8cb..f6ff57b7efa5 100644 --- 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; |
