dirty fix to merging

1 files changed, 25 insertions, 0 deletions

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
new file mode 100644
index 00000000..92e27119
--- /dev/null
+++ b/arch/x86/mm/numa_64.c
@@ -0,0 +1,25 @@
+/*
+ * Generic VM initialization for x86-64 NUMA setups.
+ * Copyright 2002,2003 Andi Kleen, SuSE Labs.
+ */
+#include <linux/bootmem.h>
+
+#include "numa_internal.h"
+
+void __init initmem_init(void)
+{
+	x86_numa_init();
+}
+
+unsigned long __init numa_free_all_bootmem(void)
+{
+	unsigned long pages = 0;
+	int i;
+
+	for_each_online_node(i)
+		pages += free_all_bootmem_node(NODE_DATA(i));
+
+	pages += free_low_memory_core_early(MAX_NUMNODES);
+
+	return pages;
+}