From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1A82C282C8 for ; Mon, 28 Jan 2019 17:25:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 730B620855 for ; Mon, 28 Jan 2019 17:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548696329; bh=i3zSXy11zY0+DidiBDEhOf8dL85Mhur4FhdIrrnlCrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RIqbnKVuomeQaKqOT6bcUKcTGjkq4w+oXviNY6Xo6RLJSkfyi59y+J8wB9ZKb4Gnk vfOCWhp/O0Cdxd5YoOcf77nfH28Y9H6vcWKmE+1DvLhMShbUfucf1P7Qjta4edTLGH 8hykkd2xheHWC2ebTRdmx7g0Y9BZbqbvHtHhJJlc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730411AbfA1RZ2 (ORCPT ); Mon, 28 Jan 2019 12:25:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:46496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730961AbfA1QBM (ORCPT ); Mon, 28 Jan 2019 11:01:12 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 256D02082E; Mon, 28 Jan 2019 16:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691271; bh=i3zSXy11zY0+DidiBDEhOf8dL85Mhur4FhdIrrnlCrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TyovDcHU+ZegafW3oCK5eNOCDwMko4ncRu7YtxOvwJfSMInItKPsDo/b7cBhQaFgy DeUgRwdrv4mllyP6zGC7Nl3yj4P3Ayr3Kf70f+C4xgO1P6+RAbRRKbtR8Z5yibK7Y7 dQgMOJT9uBs6jj2EPFdJYrYNcDwoY0Ytn70Xngek= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.19 040/258] vbox: fix link error with 'gcc -Og' Date: Mon, 28 Jan 2019 10:55:46 -0500 Message-Id: <20190128155924.51521-40-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128155924.51521-1-sashal@kernel.org> References: <20190128155924.51521-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit b8ae30a7020d61e0504529adf45abb08fa5c59f5 ] With the new CONFIG_CC_OPTIMIZE_FOR_DEBUGGING option, we get a link error in the vboxguest driver, when that fails to optimize out the call to the compat handler: drivers/virt/vboxguest/vboxguest_core.o: In function `vbg_ioctl_hgcm_call': vboxguest_core.c:(.text+0x1f6e): undefined reference to `vbg_hgcm_call32' Another compile-time check documents better what we want and avoids the error. Acked-by: Randy Dunlap Tested-by: Randy Dunlap Signed-off-by: Arnd Bergmann Reviewed-by: Hans de Goede Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/virt/vboxguest/vboxguest_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c index 3093655c7b92..1475ed5ffcde 100644 --- a/drivers/virt/vboxguest/vboxguest_core.c +++ b/drivers/virt/vboxguest/vboxguest_core.c @@ -1312,7 +1312,7 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev, return -EINVAL; } - if (f32bit) + if (IS_ENABLED(CONFIG_COMPAT) && f32bit) ret = vbg_hgcm_call32(gdev, client_id, call->function, call->timeout_ms, VBG_IOCTL_HGCM_CALL_PARMS32(call), -- 2.19.1