From 5833216d5d88dae1ee61b6d90c953dbb6f8ab4e8 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 17 Jun 2016 14:10:15 +0800 Subject: linux-qoriq: fix vmpic_msi_feature not used error Fix the below 'unused-const-variable' error: .../arch/powerpc/sysdev/fsl_msi.c:661:37: error: 'vmpic_msi_feature' | defined but not used [-Werror=unused-const-variable=] | static const struct fsl_msi_feature vmpic_msi_feature = { | ^~~~~~~~~~~~~~~~~ | cc1: all warnings being treated as errors | make[3]: *** [arch/powerpc/sysdev/fsl_msi.o] Error 1 | make[2]: *** [arch/powerpc/sysdev] Error 2 | make[1]: *** [sub-make] Error 2 | make: *** [__sub-make] Error 2 Signed-off-by: Ting Liu --- ...pic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch | 32 ++++++++++++++++++++++ recipes-kernel/linux/linux-qoriq_4.1.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 recipes-kernel/linux/files/only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch (limited to 'recipes-kernel/linux') diff --git a/recipes-kernel/linux/files/only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch b/recipes-kernel/linux/files/only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch new file mode 100644 index 0000000..5f3220d --- /dev/null +++ b/recipes-kernel/linux/files/only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch @@ -0,0 +1,32 @@ +From 15895f6880829ee502f0a48412173fb452b23c0b Mon Sep 17 00:00:00 2001 +From: Ting Liu +Date: Fri, 17 Jun 2016 10:57:35 +0800 +Subject: [PATCH] only set vmpic_msi_feature if CONFIG_EPAPR_PARAVIRT defined + +Upstream-Status: Pending + +Signed-off-by: Ting Liu +--- + arch/powerpc/sysdev/fsl_msi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c +index 963661a..95d7111 100644 +--- a/arch/powerpc/sysdev/fsl_msi.c ++++ b/arch/powerpc/sysdev/fsl_msi.c +@@ -658,10 +658,12 @@ static const struct fsl_msi_feature ipic_msi_feature = { + .msiir_offset = 0x38, + }; + ++#ifdef CONFIG_EPAPR_PARAVIRT + static const struct fsl_msi_feature vmpic_msi_feature = { + .fsl_pic_ip = FSL_PIC_IP_VMPIC, + .msiir_offset = 0, + }; ++#endif + + static const struct of_device_id fsl_of_msi_ids[] = { + { +-- +1.9.2 + diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bb b/recipes-kernel/linux/linux-qoriq_4.1.bb index 87eebbc..b837e8f 100644 --- a/recipes-kernel/linux/linux-qoriq_4.1.bb +++ b/recipes-kernel/linux/linux-qoriq_4.1.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v2.0.x \ file://modify-defconfig-t1040-nr-cpus.patch \ file://fix-the-compile-issue-under-gcc6.patch \ + file://only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch \ " SRCREV = "bd51baffc04ecc73f933aee1c3a37c8b44b889a7" -- cgit v1.2.3-54-g00ecf