Subject: [merged] mm-nobootmemc-mark-function-as-static.patch removed from -mm tree
To: rashika.kheria@xxxxxxxxx,josh@xxxxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:31:48 -0700
The patch titled
Subject: mm/nobootmem.c: mark function as static
has been removed from the -mm tree. Its filename was
mm-nobootmemc-mark-function-as-static.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Rashika Kheria <rashika.kheria@xxxxxxxxx>
Subject: mm/nobootmem.c: mark function as static
Mark function as static in nobootmem.c because it is not used outside this
file.
This eliminates the following warning in mm/nobootmem.c:
mm/nobootmem.c:324:15: warning: no previous prototype for `___alloc_bootmem_node' [-Wmissing-prototypes]
Signed-off-by: Rashika Kheria <rashika.kheria@xxxxxxxxx>
Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/nobootmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/nobootmem.c~mm-nobootmemc-mark-function-as-static mm/nobootmem.c
--- a/mm/nobootmem.c~mm-nobootmemc-mark-function-as-static
+++ a/mm/nobootmem.c
@@ -334,7 +334,7 @@ void * __init __alloc_bootmem_node_nopan
return ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0);
}
-void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
+static void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
unsigned long align, unsigned long goal,
unsigned long limit)
{
_
Patches currently in -mm which might be from rashika.kheria@xxxxxxxxx are
origin.patch
include-linux-crash_dumph-add-vmcore_cleanup-prototype.patch
include-linux-crash_dumph-add-vmcore_cleanup-prototype-fix.patch
linux-next.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
