diff options
-rw-r--r-- | arch/ia64/Kconfig | 4 | ||||
-rw-r--r-- | include/linux/memory_hotplug.h | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 18318749884b..a56df7bf022d 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -374,6 +374,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID | |||
374 | def_bool y | 374 | def_bool y |
375 | depends on NEED_MULTIPLE_NODES | 375 | depends on NEED_MULTIPLE_NODES |
376 | 376 | ||
377 | config HAVE_ARCH_NODEDATA_EXTENSION | ||
378 | def_bool y | ||
379 | depends on NUMA | ||
380 | |||
377 | config IA32_SUPPORT | 381 | config IA32_SUPPORT |
378 | bool "Support for Linux/x86 binaries" | 382 | bool "Support for Linux/x86 binaries" |
379 | help | 383 | help |
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index c6fd2c0323fc..569b1f6c27d1 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
@@ -91,6 +91,9 @@ static inline pg_data_t *arch_alloc_nodedata(int nid) | |||
91 | static inline void arch_free_nodedata(pg_data_t *pgdat) | 91 | static inline void arch_free_nodedata(pg_data_t *pgdat) |
92 | { | 92 | { |
93 | } | 93 | } |
94 | static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) | ||
95 | { | ||
96 | } | ||
94 | 97 | ||
95 | #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ | 98 | #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ |
96 | 99 | ||
@@ -114,6 +117,12 @@ static inline void arch_free_nodedata(pg_data_t *pgdat) | |||
114 | */ | 117 | */ |
115 | #define generic_free_nodedata(pgdat) kfree(pgdat) | 118 | #define generic_free_nodedata(pgdat) kfree(pgdat) |
116 | 119 | ||
120 | extern pg_data_t *node_data[]; | ||
121 | static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) | ||
122 | { | ||
123 | node_data[nid] = pgdat; | ||
124 | } | ||
125 | |||
117 | #else /* !CONFIG_NUMA */ | 126 | #else /* !CONFIG_NUMA */ |
118 | 127 | ||
119 | /* never called */ | 128 | /* never called */ |
@@ -125,6 +134,9 @@ static inline pg_data_t *generic_alloc_nodedata(int nid) | |||
125 | static inline void generic_free_nodedata(pg_data_t *pgdat) | 134 | static inline void generic_free_nodedata(pg_data_t *pgdat) |
126 | { | 135 | { |
127 | } | 136 | } |
137 | static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) | ||
138 | { | ||
139 | } | ||
128 | #endif /* CONFIG_NUMA */ | 140 | #endif /* CONFIG_NUMA */ |
129 | #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ | 141 | #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ |
130 | 142 | ||