path: root/arch/arm/mm
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-07 11:20:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-07 11:20:59 -0700
commitcd6407fe220c5cf26c117457f5bcdfd6a81fbef8 (patch)
treead7ba1b762935cd914bb2f2f1af40238cbeb20cb /arch/arm/mm
parent26c439d4005d94b8da28e023e285fd4a9943470e (diff)
parent09b2ad13da3ac7c717dd86bfca7072d9b36f7449 (diff)
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King: "Last merge window, we had some updates from Al cleaning up the signal restart handling. These have caused some problems on ARM, and while Al has some fixes, we have some concerns with Al's patches but we've been unsuccesful with discussing this. We have got to the point where we need to do something, and we've decided that the best solution is to revert the appropriate commits until Al is able to reply to us. Also included here are four patches to fix warnings that I've noticed in my build system, and one fix for kprobes test code." * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: fix warning caused by wrongly typed arm_dma_limit ARM: fix warnings about atomic64_read ARM: 7440/1: kprobes: only test 'sub pc, pc, #1b-2b+8-2' on ARMv6 ARM: 7441/1: perf: return -EOPNOTSUPP if requested mode exclusion is unavailable ARM: 7443/1: Revert "new way of handling ERESTART_RESTARTBLOCK" ARM: 7442/1: Revert "remove unused restart trampoline" ARM: fix set_domain() macro ARM: fix mach-versatile/pci.c warning
Diffstat (limited to 'arch/arm/mm')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index c471436c7952..2e8a1efdf7b8 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -64,7 +64,7 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
extern phys_addr_t arm_dma_limit;
-#define arm_dma_limit ((u32)~0)
+#define arm_dma_limit ((phys_addr_t)~0)
extern phys_addr_t arm_lowmem_limit;