From efb742bd99168dd6309052cc240b57b0954bb79a Mon Sep 17 00:00:00 2001 From: Ashok Raj Date: Wed, 1 Feb 2006 03:04:44 -0800 Subject: [PATCH] --- yaml --- r: 19319 b: refs/heads/master c: 6292d9aaf3047f1abd970bc64ab6d952eda258ac h: refs/heads/master i: 19317: 3d81faba1f0d74c7bad70f8248f48478b78e310f 19315: 6706fa88d796e9b8255a748f5b2d72ff107a342c 19311: b21e5ca7d21a9c837388fb94a7333b0e18895d36 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d3a90c22b870..fb88efed0529 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88356e908521a84b2220c9e8850d1a356a851aa9 +refs/heads/master: 6292d9aaf3047f1abd970bc64ab6d952eda258ac diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index df54e2fc8ee0..44b4eb4202d9 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1799,7 +1799,7 @@ void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn, memmap_init_zone((size), (nid), (zone), (start_pfn)) #endif -static int __meminit zone_batchsize(struct zone *zone) +static int __cpuinit zone_batchsize(struct zone *zone) { int batch; @@ -1893,7 +1893,7 @@ static struct per_cpu_pageset * Dynamically allocate memory for the * per cpu pageset array in struct zone. */ -static int __meminit process_zones(int cpu) +static int __cpuinit process_zones(int cpu) { struct zone *zone, *dzone; @@ -1934,7 +1934,7 @@ static inline void free_zone_pagesets(int cpu) } } -static int __meminit pageset_cpuup_callback(struct notifier_block *nfb, +static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) {