summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-03-14 12:04:41 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-15 01:27:48 +0300
commitbb81e6050fdc0f2303b47d9300db232571e3e42a (patch)
tree95461e3d8c89c8714f4c5f98752c9e7c24a28457 /arch/s390
parentd8b3966e4c976dbf5f2fbe693b381305f7911e3d (diff)
downloadlinux-bb81e6050fdc0f2303b47d9300db232571e3e42a.tar.xz
[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>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/appldata/appldata_mem.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index 4ca615788702..697eb30a68a3 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -117,7 +117,10 @@ static void appldata_get_mem_data(void *data)
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];