mm/memblock.c: quiet sparse noise

PATCH New H Hartley Sweeten 1 participant 1 message Sep 23, 2011

Subsystems (2)

Memory management memblock and memory management initialization

lore

Share & tools

lore

H Hartley Sweeten

author

2011-09-23 00:50 UTC #0 lore raw

PATCH 1/1 mm/memblock.c: quiet sparse noise

Quiet the following sparse noise in this file:

warning: function 'memblock_memory_can_coalesce' with external linkage has definition
warning: symbol 'memblock_overlaps_region' was not declared. Should it be static?

Signed-off-by H Hartley Sweeten <hsweeten@visionengravers,com>

Cc Andrew Morton <[email protected]>

Cc Yinghai Lu <[email protected]>

"H. Peter Anvin" <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Tomi Valkeinen <[email protected]>

---

mm/memblock.c +4 -3

index b7ed636..f40b22c 100644
@@ -58,7 +58,8 @@ static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, p
 	return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
 }
 
-long __init_memblock memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
+static long __init_memblock memblock_overlaps_region(struct memblock_type *type,
+					phys_addr_t base, phys_addr_t size)
 {
 	unsigned long i;

@@ -267,8 +268,8 @@ static int __init_memblock memblock_double_array(struct memblock_type *type)
 	return 0;
 }
 
-extern int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
-					  phys_addr_t addr2, phys_addr_t size2)
+int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1,
+		phys_addr_t size1, phys_addr_t addr2, phys_addr_t size2)
 {
 	return 1;
 }

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>