diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 12:44:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 12:44:10 -0800 |
| commit | 0cbaed1d8c2493934b86b4ad99b2de9fcce008e8 (patch) | |
| tree | 31d1fe752641900a8eaa608d6daae3babd01e609 /arch/arm/mm/mmu.c | |
| parent | 505569d208e61ab14f4b87957be0970ab33eb319 (diff) | |
| parent | 1e3479225acbb7ae048ac30fb7c6090fa7f0df02 (diff) | |
| download | linux-0cbaed1d8c2493934b86b4ad99b2de9fcce008e8.tar.gz linux-0cbaed1d8c2493934b86b4ad99b2de9fcce008e8.tar.xz | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Three small fixes from over the Christmas period, and wiring up the
new execveat syscall for ARM"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error
ARM: 8253/1: mm: use phys_addr_t type in map_lowmem() for kernel mem region
ARM: 8249/1: mm: dump: don't skip regions
ARM: wire up execveat syscall
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index cda7c40999b6..4e6ef896c619 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1329,8 +1329,8 @@ static void __init kmap_init(void) static void __init map_lowmem(void) { struct memblock_region *reg; - unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE); - unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE); + phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE); + phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE); /* Map all the lowmem memory banks. */ for_each_memblock(memory, reg) { |