The patch titled
change-zonelist-order-v6-zonelist-fix-2
has been removed from the -mm tree. Its filename was
change-zonelist-order-v6-zonelist-fix-2.patch
This patch was dropped because it was folded into change-zonelist-order-zonelist-order-selection-logic.patch
------------------------------------------------------
Subject: change-zonelist-order-v6-zonelist-fix-2
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxx
Fixes section mismatch.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN mm/page_alloc.c~change-zonelist-order-v6-zonelist-fix-2 mm/page_alloc.c
--- a/mm/page_alloc.c~change-zonelist-order-v6-zonelist-fix-2
+++ a/mm/page_alloc.c
@@ -1621,8 +1621,8 @@ void show_free_areas(void)
*
* Add all populated zones of a node to the zonelist.
*/
-static int __meminit build_zonelists_node(pg_data_t *pgdat,
- struct zonelist *zonelist, int nr_zones, enum zone_type zone_type)
+static int build_zonelists_node(pg_data_t *pgdat, struct zonelist *zonelist,
+ int nr_zones, enum zone_type zone_type)
{
struct zone *zone;
@@ -1923,7 +1923,7 @@ static void build_zonelists(pg_data_t *p
}
/* Construct the zonelist performance cache - see further mmzone.h */
-static void __meminit build_zonelist_cache(pg_data_t *pgdat)
+static void build_zonelist_cache(pg_data_t *pgdat)
{
int i;
@@ -1948,7 +1948,7 @@ static void set_zonelist_order(void)
current_zonelist_order = ZONELIST_ORDER_ZONE;
}
-static void __meminit build_zonelists(pg_data_t *pgdat)
+static void build_zonelists(pg_data_t *pgdat)
{
int node, local_node;
enum zone_type i,j;
@@ -1984,7 +1984,7 @@ static void __meminit build_zonelists(pg
}
/* non-NUMA variant of zonelist performance cache - just NULL zlcache_ptr */
-static void __meminit build_zonelist_cache(pg_data_t *pgdat)
+static void build_zonelist_cache(pg_data_t *pgdat)
{
int i;
_
Patches currently in -mm which might be from kamezawa.hiroyu@xxxxxxxxxxxxx are
change-zonelist-order-zonelist-order-selection-logic.patch
change-zonelist-order-v6-zonelist-fix-2.patch
change-zonelist-order-auto-configuration.patch
change-zonelist-order-documentaion.patch
memory-unplug-v7-migration-by-kernel.patch
memory-unplug-v7-isolate_lru_page-fix.patch
memory-unplug-v7-memory-hotplug-cleanup.patch
memory-unplug-v7-page-isolation.patch
memory-unplug-v7-page-offline.patch
memory-unplug-v7-ia64-interface.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
