On Wed, 2 Apr 2014 09:47:01 +0200, Thierry Reding <treding@xxxxxxxxxx> wrote: > Commit 4485681939b9 (of/fdt: Clean up casting in unflattening path) > modified unflatten_dt_node() to take a void * for the mem parameter > instead of an unsigned long. One of the call sites wasn't updated. > > Signed-off-by: Thierry Reding <treding@xxxxxxxxxx> Applied, thanks, but removed new line split. Sometimes keeping the 80 column limit just isn't worth it. :-) g. > --- > drivers/of/fdt.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index fa16a912a927..383c6e665d13 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -385,7 +385,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob, > > /* First pass, scan for size */ > start = ((void *)blob) + be32_to_cpu(blob->off_dt_struct); > - size = (unsigned long)unflatten_dt_node(blob, 0, &start, NULL, NULL, 0); > + size = (unsigned long)unflatten_dt_node(blob, NULL, &start, NULL, NULL, > + 0); > size = ALIGN(size, 4); > > pr_debug(" size is %lx, allocating...\n", size); > -- > 1.9.1 > > > ----------------------------------------------------------------------------------- > This email message is for the sole use of the intended recipient(s) and may contain > confidential information. Any unauthorized review, use, disclosure or distribution > is prohibited. If you are not the intended recipient, please contact the sender by > reply email and destroy all copies of the original message. > ----------------------------------------------------------------------------------- -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html