patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-arm / arch-iop3xx / memory.h

diff --git a/include/asm-arm/arch-iop3xx/memory.h b/include/asm-arm/arch-iop3xx/memory.h
index 5bd0800..a2d077a 100644 (file)
--- a/include/asm-arm/arch-iop3xx/memory.h
+++ b/include/asm-arm/arch-iop3xx/memory.h
@@ -9,36 +9,11 @@
 #include <asm/arch/iop310.h>
 #include <asm/arch/iop321.h>
 
-/*
- * Task size: 3GB
- */
-#define TASK_SIZE      (0xbf000000UL)
-#define TASK_SIZE_26   (0x04000000UL)
-
-/*
- * This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE (0x40000000)
-
-/*
- * Page offset: 3GB
- */
-#define PAGE_OFFSET    (0xc0000000UL)
-
 /*
  * Physical DRAM offset.
  */
 #define PHYS_OFFSET    (0xa0000000UL)
 
-/*
- * physical vs virtual ram conversion
- */
-#define __virt_to_phys__is_a_macro
-#define __phys_to_virt__is_a_macro
-#define __virt_to_phys(x)      ((x) - PAGE_OFFSET + PHYS_OFFSET)
-#define __phys_to_virt(x)      ((x) - PHYS_OFFSET + PAGE_OFFSET)
-
 /*
  * Virtual view <-> DMA view memory address translations
  * virt_to_bus: Used to translate the virtual address to an
@@ -46,9 +21,6 @@
  * bus_to_virt: Used to convert an address for DMA operations
  *             to an address that the kernel can use.
  */
-#define __virt_to_bus__is_a_macro
-#define __bus_to_virt__is_a_macro
-
 #ifdef CONFIG_ARCH_IOP310
 
 #define __virt_to_bus(x)       (((__virt_to_phys(x)) & ~(*IOP310_SIATVR)) | ((*IOP310_SIABAR) & 0xfffffff0))