From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939849AbdD1JoU (ORCPT ); Fri, 28 Apr 2017 05:44:20 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:49965 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939830AbdD1JoO (ORCPT ); Fri, 28 Apr 2017 05:44:14 -0400 From: Arnd Bergmann To: Rob Herring , Frank Rowand Cc: Arnd Bergmann , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY Date: Fri, 28 Apr 2017 11:44:12 +0200 Message-Id: <20170428094429.2396195-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170428094429.2396195-1-arnd@arndb.de> References: <20170428094429.2396195-1-arnd@arndb.de> X-Provags-ID: V03:K0:eSuF03EJwOfwagZwpStDuXAR4GQ6DBdwYaKKILJYVt3Bns53Qo2 9C90wjGVng1ZHDu9uKQyASKQp/3eOtjAo6VYa/bROVroQf18uIwUMlSmMc6tlFprxpEfzb7 zaRd64j+iBgjGxi0gl9bZRy6xwnIJMs/9n/PBBtrrNKOTSWULhmAW4eaMabR68rhdzCf5c7 m7tCd5IF4gmLVYBX1k3DQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:W1u6NHW+wRs=:n+ECGLY1I0V6gJi4E0FrmH icdNroEWx9EpK5Qq56J2FqT/XrAQStSYUVTfopTg1QrYu8X5TuFusx/I2xHoRo7XxFltFRVGv yhrcd70OxpAN1rlPuFogCV3recyVL5oCBcx+s8oOzi7fONQjQOBNoCeaPdLEDuIX5q6MKXDxi 7qpL0ItQTqZUDALVvb5DxPhSmNeT631kYBo2c6Ym88zjMCWcYGjGQQGXjDGtU+Uala4ced8N8 NAmSORRLyFhWEJfZUo5tOYP2CclPlK1LC8RJDCzVLLLba09gdxvOLlGZ8nuV/Tf8P1u2wbxev SsOFJRDFMFuBh0bJWpcpUlV6aI55Brhm1wNwCn9Cq2I/dW96AY5BBEzPed/+5ZRmog+7rwmpQ gUO0c297qdRj3nLjbCTNpKXS/JPN4C3WS0HtPPqW/uOaMIwKU7mpfsCI3lL+qwIF5D/awW/Xf j1dV4eNTkSIuNJbyQmFmaD3Cv4Aj0XWbOLPfVpUxyrNOqshYQHBikqeWzfg/0ZZwIbTQQsjhD sGfwZFVLhObc2l+13KuRVGcQgDyZVJTHBIPufm1UiSwH3GFrnUfiIkwu4necWbjX6L+uMdRAl EENf37qL7jDZmzKtGDcMDiWKjuqNIuIn3v0LlKlO5TkVG8GmEq2+MFMcdYRWnlwVG/SbR8OKT WHgoCPGN5kBZY7mMtx0iEnYrdzlPbn0mfmshHcuCgY1ZewmlSugmyoi+pOuMcaj6woTg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We get a link error when the new tests are used by overlays are not: drivers/of/built-in.o: In function `unflatten_device_tree': (.init.text+0x967): undefined reference to `unittest_unflatten_overlay_base' This makes the #ifdef check match the symbols that lead to building the unittest_unflatten_overlay_base function. Fixes: 81d0848fc8d2 ("of: Add unit tests for applying overlays") Signed-off-by: Arnd Bergmann --- drivers/of/of_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index de5c604f5cc4..4ebb0149d118 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -55,7 +55,7 @@ static inline int of_property_notify(int action, struct device_node *np, } #endif /* CONFIG_OF_DYNAMIC */ -#ifdef CONFIG_OF_UNITTEST +#if defined(CONFIG_OF_UNITTEST) && defined(CONFIG_OF_OVERLAY) extern void __init unittest_unflatten_overlay_base(void); #else static inline void unittest_unflatten_overlay_base(void) {}; -- 2.9.0