X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=arch%2Fs390%2Fnuma%2Fnuma.c;h=d31bde0870d894bdc2cd3a3006d966924d1d5c1c;hp=6c151b42e65db2ec8c5b81243190eac2416e4f04;hb=3541833fd1f264e7579e573a6586a1b665da37db;hpb=0bb2ae1b26e1fb7543ec7474cdd374ac4b88c4da

diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
index 6c151b42e65d..d31bde0870d8 100644
--- a/arch/s390/numa/numa.c
+++ b/arch/s390/numa/numa.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/mmzone.h>
 #include <linux/cpumask.h>
-#include <linux/bootmem.h>
 #include <linux/memblock.h>
 #include <linux/slab.h>
 #include <linux/node.h>
@@ -65,7 +64,7 @@ static __init pg_data_t *alloc_node_data(void)
 {
 	pg_data_t *res;
 
-	res = (pg_data_t *) memblock_alloc(sizeof(pg_data_t), 8);
+	res = (pg_data_t *) memblock_phys_alloc(sizeof(pg_data_t), 8);
 	memset(res, 0, sizeof(pg_data_t));
 	return res;
 }