Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=75f4aa...
Commit:     75f4aa15cf05ce6d99c8261cf57dcd749877fd1c
Parent:     252d4c276dc0895834af48743579cf19d1fa150b
Author:     Nicolas Pitre <nico@cam.org>
AuthorDate: Fri Sep 5 16:05:14 2008 -0400
Committer:  Russell King <rmk+kernel@arm.linux.org.uk>
CommitDate: Fri Nov 28 15:36:48 2008 +0000

    [ARM] unconditionally define __virt_to_phys and __phys_to_virt
    
    There is no machine class overriding this.  If non linear translations
    are implemented again for some machines then this could be restored at
    that time.
    
    Signed-off-by: Nicolas Pitre <nico@marvell.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/include/asm/memory.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 7776430..7238b3b 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -112,10 +112,8 @@
  * private definitions which should NOT be used outside memory.h
  * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.
  */
-#ifndef __virt_to_phys
 #define __virt_to_phys(x)	((x) - PAGE_OFFSET + PHYS_OFFSET)
 #define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)
-#endif
 
 /*
  * Convert a physical address to a Page Frame Number and back
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html