summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2016-01-15 14:50:25 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-01-19 12:14:01 +0100
commitef1f7fd7eba19eb64fc424355eb9d4e49ca06fb1 (patch)
treeb002f11020df052fc9ad38491739f54695dfa881 /arch/s390
parent204ee2c5643199a25181ec04ea645d00709c2a5a (diff)
downloadlinux-ef1f7fd7eba19eb64fc424355eb9d4e49ca06fb1.tar.bz2
s390/numa: allocate memory with correct alignment
Allocating memory with a requested minimum alignment of 1 is wrong since pg_data_t contains a spinlock which requires an alignment of 4 bytes. Therefore fix this and ask for an alignment of 8 bytes like it is guarenteed for all kmalloc requests. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/numa/numa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
index 43f32ce60aa3..b75ac43060e1 100644
--- a/arch/s390/numa/numa.c
+++ b/arch/s390/numa/numa.c
@@ -57,7 +57,7 @@ static __init pg_data_t *alloc_node_data(void)
{
pg_data_t *res;
- res = (pg_data_t *) memblock_alloc(sizeof(pg_data_t), 1);
+ res = (pg_data_t *) memblock_alloc(sizeof(pg_data_t), 8);
if (!res)
panic("Could not allocate memory for node data!\n");
memset(res, 0, sizeof(pg_data_t));