The patch titled
s390: remove HIGHMEM dependencies
has been added to the -mm tree. Its filename is
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: s390: remove HIGHMEM dependencies
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
s390 doesn't support CONFIG_HIGHMEM. Anything that depends on it would be
dead code.
Acked-by: Christoph Lameter <clameter@xxxxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/appldata/appldata_mem.c | 3 ---
1 files changed, 3 deletions(-)
diff -puN arch/s390/appldata/appldata_mem.c~reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix-fix arch/s390/appldata/appldata_mem.c
--- a/arch/s390/appldata/appldata_mem.c~reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix-fix
+++ a/arch/s390/appldata/appldata_mem.c
@@ -118,9 +118,6 @@ static void appldata_get_mem_data(void *
mem_data->pswpin = ev[PSWPIN];
mem_data->pswpout = ev[PSWPOUT];
mem_data->pgalloc = ev[PGALLOC_NORMAL] + ev[PGALLOC_DMA];
-#ifdef CONFIG_HIGHMEM
- mem_data->pgalloc += ev[PGALLOC_HIGH];
-#endif
mem_data->pgfault = ev[PGFAULT];
mem_data->pgmajfault = ev[PGMAJFAULT];
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
s390-fix-arp_tbl-lock-usage-in-qeth.patch
git-net.patch
git-s390.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix-fix.patch
slab-respect-architecture-and-caller-mandated-alignment.patch
bootmem-use-max_dma_address-instead-of-low32limit.patch
s390-fix-cmm-kernel-thread-handling.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
