Commit fea2efe3 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Remove PFN_TO_NID for !DISCONTIGMEM

Platform classes need not define PFN_TO_NID when DISCONTIGMEM is
not selected.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1619cca2
...@@ -64,10 +64,6 @@ ...@@ -64,10 +64,6 @@
#define NODE_MAX_MEM_SHIFT 26 #define NODE_MAX_MEM_SHIFT 26
#define NODE_MAX_MEM_SIZE (1 << NODE_MAX_MEM_SHIFT) #define NODE_MAX_MEM_SIZE (1 << NODE_MAX_MEM_SHIFT)
#else
#define PFN_TO_NID(addr) (0)
#endif /* CONFIG_DISCONTIGMEM */ #endif /* CONFIG_DISCONTIGMEM */
#endif /* __ASM_ARCH_MEMORY_H */ #endif /* __ASM_ARCH_MEMORY_H */
...@@ -36,6 +36,4 @@ ...@@ -36,6 +36,4 @@
#endif #endif
#define PFN_TO_NID(addr) (0)
#endif #endif
...@@ -85,10 +85,6 @@ ...@@ -85,10 +85,6 @@
(((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT) (((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)
# endif # endif
#else
# define PFN_TO_NID(addr) (0)
#endif #endif
#endif #endif
...@@ -86,6 +86,5 @@ ...@@ -86,6 +86,5 @@
#endif /* CONFIG_ARCH_OMAP1510 */ #endif /* CONFIG_ARCH_OMAP1510 */
#define PHYS_TO_NID(addr) (0)
#endif #endif
...@@ -67,10 +67,6 @@ ...@@ -67,10 +67,6 @@
#define LOCAL_MAP_NR(addr) \ #define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x03ffffff) >> PAGE_SHIFT) (((unsigned long)(addr) & 0x03ffffff) >> PAGE_SHIFT)
#else
#define PFN_TO_NID(addr) (0)
#endif #endif
#endif #endif
...@@ -99,10 +99,6 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) ...@@ -99,10 +99,6 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes)
#define LOCAL_MAP_NR(addr) \ #define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT) (((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT)
#else
#define PFN_TO_NID(addr) (0)
#endif #endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment