patch-2_6_7-vs1_9_1_12

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

diff --git a/include/asm-arm/arch-nexuspci/memory.h b/include/asm-arm/arch-nexuspci/memory.h
index 89423f0..85d7c45 100644 (file)
--- a/include/asm-arm/arch-nexuspci/memory.h
+++ b/include/asm-arm/arch-nexuspci/memory.h
@@ -5,42 +5,19 @@
  * Copyright (c) 1999 Russell King
  *
  */
-#ifndef __ASM_ARCH_MMU_H
-#define __ASM_ARCH_MMU_H
+#ifndef __ASM_ARCH_MEMORY_H
+#define __ASM_ARCH_MEMORY_H
 
 /*
- * Task size: 3GB
+ * Physical DRAM offset.
  */
-#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)
 #define PHYS_OFFSET    (0x40000000UL)
 #define BUS_OFFSET     (0xe0000000UL)
 
-/*
- * DRAM is contiguous
- */
-#define __virt_to_phys(vpage) ((unsigned long)(vpage) - PAGE_OFFSET + PHYS_OFFSET)
-#define __phys_to_virt(ppage) ((unsigned long)(ppage) + PAGE_OFFSET - PHYS_OFFSET)
-#define __virt_to_phys__is_a_macro
-#define __phys_to_virt__is_a_macro
-
 /*
  * On the PCI bus the DRAM appears at address 0xe0000000
  */
-#define __virt_to_bus__is_a_macro
 #define __virt_to_bus(x) ((unsigned long)(x) - PAGE_OFFSET + BUS_OFFSET)
-#define __bus_to_virt__is_a_macro
 #define __bus_to_virt(x) ((unsigned long)(x) + PAGE_OFFSET - BUS_OFFSET)
 
 #endif