The patch titled
reduce MAX_NR_ZONES: move HIGHMEM counters into highmem.c/.h
has been removed from the -mm tree. Its filename is
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: reduce MAX_NR_ZONES: move HIGHMEM counters into highmem.c/.h
From: Christoph Lameter <clameter@xxxxxxx>
Move totalhigh_pages and nr_free_highpages() into highmem.c/.h
Move the totalhigh_pages definition into highmem.c/.h. Move the
nr_free_highpages function into highmem.c
[yoichi_yuasa@xxxxxxxxxxxxxx: build fix]
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/mips/sgi-ip27/ip27-memory.c | 1 +
arch/um/kernel/mem.c | 2 ++
include/linux/highmem.h | 3 +++
include/linux/swap.h | 1 -
mm/highmem.c | 13 +++++++++++++
mm/page_alloc.c | 15 ---------------
mm/shmem.c | 1 +
7 files changed, 20 insertions(+), 16 deletions(-)
diff -puN arch/mips/sgi-ip27/ip27-memory.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h arch/mips/sgi-ip27/ip27-memory.c
--- a/arch/mips/sgi-ip27/ip27-memory.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/arch/mips/sgi-ip27/ip27-memory.c
@@ -19,6 +19,7 @@
#include <linux/swap.h>
#include <linux/bootmem.h>
#include <linux/pfn.h>
+#include <linux/highmem.h>
#include <asm/page.h>
#include <asm/sections.h>
diff -puN arch/um/kernel/mem.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h arch/um/kernel/mem.c
--- a/arch/um/kernel/mem.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/arch/um/kernel/mem.c
@@ -79,8 +79,10 @@ void mem_init(void)
/* this will put all low memory onto the freelists */
totalram_pages = free_all_bootmem();
+#ifdef CONFIG_HIGHMEM
totalhigh_pages = highmem >> PAGE_SHIFT;
totalram_pages += totalhigh_pages;
+#endif
num_physpages = totalram_pages;
max_pfn = totalram_pages;
printk(KERN_INFO "Memory: %luk available\n",
diff -puN include/linux/highmem.h~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h include/linux/highmem.h
--- a/include/linux/highmem.h~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/include/linux/highmem.h
@@ -24,11 +24,14 @@ static inline void flush_kernel_dcache_p
/* declarations for linux/mm/highmem.c */
unsigned int nr_free_highpages(void);
+extern unsigned long totalhigh_pages;
#else /* CONFIG_HIGHMEM */
static inline unsigned int nr_free_highpages(void) { return 0; }
+#define totalhigh_pages 0
+
#ifndef ARCH_HAS_KMAP
static inline void *kmap(struct page *page)
{
diff -puN include/linux/swap.h~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h include/linux/swap.h
--- a/include/linux/swap.h~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/include/linux/swap.h
@@ -162,7 +162,6 @@ extern void swapin_readahead(swp_entry_t
/* linux/mm/page_alloc.c */
extern unsigned long totalram_pages;
-extern unsigned long totalhigh_pages;
extern unsigned long totalreserve_pages;
extern long nr_swap_pages;
extern unsigned int nr_free_pages(void);
diff -puN mm/highmem.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h mm/highmem.c
--- a/mm/highmem.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/mm/highmem.c
@@ -46,6 +46,19 @@ static void *mempool_alloc_pages_isa(gfp
*/
#ifdef CONFIG_HIGHMEM
+unsigned long totalhigh_pages __read_mostly;
+
+unsigned int nr_free_highpages (void)
+{
+ pg_data_t *pgdat;
+ unsigned int pages = 0;
+
+ for_each_online_pgdat(pgdat)
+ pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages;
+
+ return pages;
+}
+
static int pkmap_count[LAST_PKMAP];
static unsigned int last_pkmap_nr;
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock);
diff -puN mm/page_alloc.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h mm/page_alloc.c
--- a/mm/page_alloc.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/mm/page_alloc.c
@@ -51,7 +51,6 @@ EXPORT_SYMBOL(node_online_map);
nodemask_t node_possible_map __read_mostly = NODE_MASK_ALL;
EXPORT_SYMBOL(node_possible_map);
unsigned long totalram_pages __read_mostly;
-unsigned long totalhigh_pages __read_mostly;
unsigned long totalreserve_pages __read_mostly;
long nr_swap_pages;
int percpu_pagelist_fraction;
@@ -1185,20 +1184,6 @@ unsigned int nr_free_pagecache_pages(voi
{
return nr_free_zone_pages(gfp_zone(GFP_HIGHUSER));
}
-
-#ifdef CONFIG_HIGHMEM
-unsigned int nr_free_highpages (void)
-{
- pg_data_t *pgdat;
- unsigned int pages = 0;
-
- for_each_online_pgdat(pgdat)
- pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages;
-
- return pages;
-}
-#endif
-
#ifdef CONFIG_NUMA
static void show_node(struct zone *zone)
{
diff -puN mm/shmem.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h mm/shmem.c
--- a/mm/shmem.c~reduce-max_nr_zones-move-highmem-counters-into-highmemc-h
+++ a/mm/shmem.c
@@ -45,6 +45,7 @@
#include <linux/namei.h>
#include <linux/ctype.h>
#include <linux/migrate.h>
+#include <linux/highmem.h>
#include <asm/uaccess.h>
#include <asm/div64.h>
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
git-ia64.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id.patch
add-numa_build-definition-in-kernelh-to-avoid-ifdef.patch
disable-gfp_thisnode-in-the-non-numa-case.patch
gfp_thisnode-for-the-slab-allocator-v2.patch
gfp_thisnode-for-the-slab-allocator-v2-fix-3.patch
add-node-to-zone-for-the-numa-case.patch
add-node-to-zone-for-the-numa-case-fix.patch
get-rid-of-zone_table.patch
get-rid-of-zone_table-fix.patch
do-not-allocate-pagesets-for-unpopulated-zones.patch
zone_statistics-use-hot-node-instead-of-cold-zone_pgdat.patch
deal-with-cases-of-zone_dma-meaning-the-first-zone.patch
introduce-config_zone_dma.patch
optional-zone_dma-in-the-vm.patch
optional-zone_dma-for-i386.patch
optional-zone_dma-for-x86_64.patch
optional-zone_dma-for-ia64.patch
remove-zone_dma-remains-from-parisc.patch
remove-zone_dma-remains-from-sh-sh64.patch
radix-tree-rcu-lockless-readside.patch
scheduler-numa-aware-placement-of-sched_group_allnodes.patch
zvc-support-nr_slab_reclaimable--nr_slab_unreclaimable-swap_prefetch.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
numa-add-zone_to_nid-function-swap_prefetch.patch
readahead-state-based-method-aging-accounting-apply-type-enum-zone_type-readahead.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
