diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-03-14 09:04:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 15:27:48 -0700 |
| commit | bb81e6050fdc0f2303b47d9300db232571e3e42a (patch) | |
| tree | 95461e3d8c89c8714f4c5f98752c9e7c24a28457 | |
| parent | d8b3966e4c976dbf5f2fbe693b381305f7911e3d (diff) | |
| download | linux-3.10-bb81e6050fdc0f2303b47d9300db232571e3e42a.tar.gz linux-3.10-bb81e6050fdc0f2303b47d9300db232571e3e42a.tar.bz2 linux-3.10-bb81e6050fdc0f2303b47d9300db232571e3e42a.zip | |
[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>
| -rw-r--r-- | arch/s390/appldata/appldata_mem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c index 4ca61578870..697eb30a68a 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]; |