[ARM] Remove PFN_TO_NID for !DISCONTIGMEM

Platform classes need not define PFN_TO_NID when DISCONTIGMEM is not selected. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
git-mirror · Sep 15, 2005 · fea2efe · fea2efe
1 parent 1619cca
commit fea2efe
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 19 deletions.
diff --git a/include/asm-arm/arch-aaec2000/memory.h b/include/asm-arm/arch-aaec2000/memory.h
@@ -64,10 +64,6 @@
 #define NODE_MAX_MEM_SHIFT	26
 #define NODE_MAX_MEM_SIZE	(1 << NODE_MAX_MEM_SHIFT)
 
-#else
-
-#define PFN_TO_NID(addr)	(0)
-
 #endif /* CONFIG_DISCONTIGMEM */
 
 #endif /* __ASM_ARCH_MEMORY_H */
diff --git a/include/asm-arm/arch-iop3xx/memory.h b/include/asm-arm/arch-iop3xx/memory.h
@@ -36,6 +36,4 @@
 
 #endif
 
-#define PFN_TO_NID(addr)	(0)
-
 #endif
diff --git a/include/asm-arm/arch-lh7a40x/memory.h b/include/asm-arm/arch-lh7a40x/memory.h
@@ -85,10 +85,6 @@
        (((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)
 # endif
 
-#else
-
-# define PFN_TO_NID(addr)	(0)
-
 #endif
 
 #endif
diff --git a/include/asm-arm/arch-omap/memory.h b/include/asm-arm/arch-omap/memory.h
@@ -86,6 +86,5 @@
 
 #endif	/* CONFIG_ARCH_OMAP1510 */
 
-#define PHYS_TO_NID(addr) (0)
 #endif
 
diff --git a/include/asm-arm/arch-pxa/memory.h b/include/asm-arm/arch-pxa/memory.h
@@ -67,10 +67,6 @@
 #define LOCAL_MAP_NR(addr) \
 	(((unsigned long)(addr) & 0x03ffffff) >> PAGE_SHIFT)
 
-#else
-
-#define PFN_TO_NID(addr)	(0)
-
 #endif
 
 #endif
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h
@@ -99,10 +99,6 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes)
 #define LOCAL_MAP_NR(addr) \
 	(((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT)
 
-#else
-
-#define PFN_TO_NID(addr)	(0)
-
 #endif
 
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,6 +36,4 @@

		#endif

		#define PFN_TO_NID(addr) (0)

		#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,10 +85,6 @@ @@
            (((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)
     # endif
-    #else
-    # define PFN_TO_NID(addr)	(0)
     #endif
     #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,6 +86,5 @@

		#endif /* CONFIG_ARCH_OMAP1510 */

		#define PHYS_TO_NID(addr) (0)
		#endif