]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] appldata build fix
authorAl Viro <viro@ftp.linux.org.uk>
Wed, 14 Mar 2007 09:04:41 +0000 (09:04 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Mar 2007 22:27:48 +0000 (15:27 -0700)
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

index 4ca6157887025abaa19e6538408a8e8c12e7badb..697eb30a68a329dd6bfdb842efd037503bbe42bb 100644 (file)
@@ -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];