Message ID | 20200526125954.237403-37-vicamo.yang@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49WYyl0Cq3z9sTL; Tue, 26 May 2020 23:02:23 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1jdZDm-0005Ee-Ky; Tue, 26 May 2020 13:02:18 +0000 Received: from mail-pl1-f195.google.com ([209.85.214.195]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <vicamo@gmail.com>) id 1jdZDE-0004ml-H3 for kernel-team@lists.ubuntu.com; Tue, 26 May 2020 13:01:44 +0000 Received: by mail-pl1-f195.google.com with SMTP id t7so8661645plr.0 for <kernel-team@lists.ubuntu.com>; Tue, 26 May 2020 06:01:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PrjFv2Av28HFwZcsoFxzznyBSgb+pSBjY4RXQ3lSh6c=; b=Wpkfs4u39SJIzv/P42x4mS9G+kAPvQ/Q188ia88yAN4zHDWTF1SSPGvmN8/PqXJwAI UYq/hHL3zjwCHmXNw8GKhfmRX0RZYx/xqLdHljfPWQDQvBLDQSwivBoLBW6bKephXA3V BwnQVuuKXwlMUeaD5EohP7HVIqJb6ZQAx0bFrA1I2f0wL7UUcKZSvznXs26H4Y+ksYQM ha/lptP6GJ3ifFGyldMJjESbMR1NTqpsFsz9A2RRlzaZ+e9vrAVLcBmuomDkaU4l6Pyd Ntsn//OD/B1xz3bMvybayHcHZnq21FlvYzHRjWMjQUhOPNIEFm9aRm4uUdf9a1Ww0hza KiwQ== X-Gm-Message-State: AOAM5328qA9Q1sB+8pfpYvdNCtB5jKwsdR1wH1wmq6iVWZZdnwuHmX2w Qq1xUJS+D9wjxQX+Vxoqk6Gmn0lgQIU= X-Google-Smtp-Source: ABdhPJyYwmulhPxofiweECzthDEe5e+sz8+KUjNCjh8ZNDAVYfvevG86byuq8C1Dsip76z0RlGs3xg== X-Received: by 2002:a17:902:ab8b:: with SMTP id f11mr1011925plr.145.1590498101298; Tue, 26 May 2020 06:01:41 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id p7sm9395812pfq.184.2020.05.26.06.01.40 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:01:40 -0700 (PDT) From: You-Sheng Yang <vicamo.yang@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 36/42][SRU][U] UBUNTU: SAUCE: iommu/renesas: Fix unused-function warning Date: Tue, 26 May 2020 20:59:48 +0800 Message-Id: <20200526125954.237403-37-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200526125954.237403-1-vicamo.yang@canonical.com> References: <20200526125954.237403-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
Fix can't find root device on VMD when secureboot enabled
|
expand
|
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index fb7e702dee23..4c2972f3153b 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -903,11 +903,8 @@ static const struct iommu_ops ipmmu_ops = { .probe_device = ipmmu_probe_device, .release_device = ipmmu_release_device, .probe_finalize = ipmmu_probe_finalize, -#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) - .device_group = generic_device_group, -#else - .device_group = ipmmu_find_group, -#endif + .device_group = IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_IOMMU_DMA) + ? generic_device_group : ipmmu_find_group, .pgsize_bitmap = SZ_1G | SZ_2M | SZ_4K, .of_xlate = ipmmu_of_xlate, };