The patch titled
Subject: firmware/memmap: avoid type conflicts with the generic memmap_init()
has been removed from the -mm tree. Its filename was
firmware-memmap-avoid-type-conflicts-with-the-generic-memmap_init.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Subject: firmware/memmap: avoid type conflicts with the generic memmap_init()
This will fix build error:
drivers/firmware/memmap.c:240:19: error: conflicting types for 'memmap_init'
arch/ia64/include/asm/pgtable.h:565:17: note: previous declaration of 'memmap_init' was here
Signed-off-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Bernhard Walle <bwalle@xxxxxxx>
Cc: Glauber Costa <glommer@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/memmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/firmware/memmap.c~firmware-memmap-avoid-type-conflicts-with-the-generic-memmap_init drivers/firmware/memmap.c
--- a/drivers/firmware/memmap.c~firmware-memmap-avoid-type-conflicts-with-the-generic-memmap_init
+++ a/drivers/firmware/memmap.c
@@ -237,7 +237,7 @@ static ssize_t memmap_attr_show(struct k
* firmware_map_add() or firmware_map_add_early() afterwards, the entries
* are not added to sysfs.
*/
-static int __init memmap_init(void)
+static int __init firmware_memmap_init(void)
{
struct firmware_map_entry *entry;
@@ -246,5 +246,5 @@ static int __init memmap_init(void)
return 0;
}
-late_initcall(memmap_init);
+late_initcall(firmware_memmap_init);
_
Patches currently in -mm which might be from fengguang.wu@xxxxxxxxx are
linux-next.patch
h8300-select-generic-atomic64_t-support.patch
writeback-remove-nr_pages_dirtied-arg-from-balance_dirty_pages_ratelimited_nr.patch
swap-add-a-simple-detector-for-inappropriate-swapin-readahead.patch
swap-add-a-simple-detector-for-inappropriate-swapin-readahead-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
