summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/mmzone.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-30 15:23:59 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-30 15:23:59 +1000
commit6da49a292534d31ca391928ea97f8225774dc1e0 (patch)
tree060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /arch/powerpc/include/asm/mmzone.h
parent17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff)
parentca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff)
downloadtalos-op-linux-6da49a292534d31ca391928ea97f8225774dc1e0.tar.gz
talos-op-linux-6da49a292534d31ca391928ea97f8225774dc1e0.zip
Merge remote branch 'origin/master' into next
Diffstat (limited to 'arch/powerpc/include/asm/mmzone.h')
-rw-r--r--arch/powerpc/include/asm/mmzone.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h
index fd3fd58bad84..7b589178be46 100644
--- a/arch/powerpc/include/asm/mmzone.h
+++ b/arch/powerpc/include/asm/mmzone.h
@@ -38,13 +38,6 @@ u64 memory_hotplug_max(void);
#define memory_hotplug_max() memblock_end_of_DRAM()
#endif
-/*
- * Following are macros that each numa implmentation must define.
- */
-
-#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn)
-#define node_end_pfn(nid) (NODE_DATA(nid)->node_end_pfn)
-
#else
#define memory_hotplug_max() memblock_end_of_DRAM()
#endif /* CONFIG_NEED_MULTIPLE_NODES */
OpenPOWER on IntegriCloud