commit bb81e6050fdc0f2303b47d9300db232571e3e42a
author Al Viro <viro@ftp.linux.org.uk> Wed Mar 14 09:04:41 2007 +0000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Mar 14 15:27:48 2007 -0700
tree 95461e3d8c89c8714f4c5f98752c9e7c24a28457
parent d8b3966e4c976dbf5f2fbe693b381305f7911e3d

[PATCH] appldata build fix

PGALLOC_DMA is defined only if we have CONFIG_ZONE_DMA

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

arch/s390/appldata/appldata_mem.c

diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index 4ca6157..697eb30 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -117,7 +117,10 @@
 	mem_data->pgpgout    = ev[PGPGOUT] >> 1;
 	mem_data->pswpin     = ev[PSWPIN];
 	mem_data->pswpout    = ev[PSWPOUT];
-	mem_data->pgalloc    = ev[PGALLOC_NORMAL] + ev[PGALLOC_DMA];
+	mem_data->pgalloc    = ev[PGALLOC_NORMAL];
+#ifdef CONFIG_ZONE_DMA
+	mem_data->pgalloc    += ev[PGALLOC_DMA];
+#endif
 	mem_data->pgfault    = ev[PGFAULT];
 	mem_data->pgmajfault = ev[PGMAJFAULT];