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 /mm | |
| 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 'mm')
| -rw-r--r-- | mm/vmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index ae007462b7f6..b7e314b1009f 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2403,7 +2403,7 @@ static int s_show(struct seq_file *m, void *p) seq_printf(m, " pages=%d", v->nr_pages); if (v->phys_addr) - seq_printf(m, " phys=%lx", v->phys_addr); + seq_printf(m, " phys=%llx", (unsigned long long)v->phys_addr); if (v->flags & VM_IOREMAP) seq_printf(m, " ioremap"); |
