]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
of: use correct function prototype for of_overlay_fdt_apply()
authorChris Packham <chris.packham@alliedtelesis.co.nz>
Fri, 22 Mar 2019 00:23:41 +0000 (13:23 +1300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:50:37 +0000 (14:50 +0100)
[ Upstream commit ecb0abc1d8528015957fbd034be8bfe760363b3b ]

When CONFIG_OF_OVERLAY is not enabled the fallback stub for
of_overlay_fdt_apply() does not match the prototype for the case when
CONFIG_OF_OVERLAY is enabled. Update the stub to use the correct
function prototype.

Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/linux/of.h

index dac0201eacef74c43f49329beeb18629aa5e95b7..d4f14b0302b634b7ba4df2a501a7d55a66e85429 100644 (file)
@@ -1425,7 +1425,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
 
 #else
 
-static inline int of_overlay_fdt_apply(void *overlay_fdt, int *ovcs_id)
+static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
+                                      int *ovcs_id)
 {
        return -ENOTSUPP;
 }