From patchwork Sat Dec 22 14:35:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1017859 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43MSl6384Cz9sPl for ; Sun, 23 Dec 2018 01:37:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rQEkdn0X"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 43MSl61MDlzDqcX for ; Sun, 23 Dec 2018 01:37:38 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rQEkdn0X"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=chunkeey@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rQEkdn0X"; dkim-atps=neutral Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 43MShv1rRLzDqWy for ; Sun, 23 Dec 2018 01:35:42 +1100 (AEDT) Received: by mail-wm1-x344.google.com with SMTP id d15so7772332wmb.3 for ; Sat, 22 Dec 2018 06:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SRF2HOXc8mXRYNmzPvFO4SQrYnTjCrYRu7gfmD606ys=; b=rQEkdn0XuVW1IRHk2j8Eu+x7gvx1y8BH4bJGq/pYwnD2m2Bu7eM6FkKXhfxxCF0TrA ElZlLCZvYMtss8ic8QFISkvmLXocMvAsM/SbYAyMnwEaJnZWeGrj9dcsPojNlHdcZALV oOntv4dBf8EETEKOJHZcsiOk+fI5speBISTS0BS7b2Kr+y6welkp4eQ9fjAa80rO8VHF I6b0HyZl8zq6VnbfPRJcR1eYHE6X6znsiKzjDqYeOr8ZmVZkzmPUqQk6WHXY8VL7/BR/ LcpT4GEEgXVLSGq1BQQLyqi4eu3t6goqGTShSgY3I1YxEvBNqcKKcp4LXfnBcsaWHLQ+ eN5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SRF2HOXc8mXRYNmzPvFO4SQrYnTjCrYRu7gfmD606ys=; b=FwnclN6XC5PLG/u7VmxnzWVw749sTsF+im+oTzUZX35pTPqpyZL+Z+VU1Lwtbyp3We 1gIzNvrcFwORYBC1KVBva2CmnxdvnfNiehFzh1kpVqV/C7shNlfVW6MpxkNvFYtHpO00 GD1TdsEispIEk+8U6gIiA5Zk8jaOUENKKraS5/E1pa3+AWzMhMGOtX4zScaBWZXV9o2I YMyY2fbAzq1SWwS0Nj6YeAsF/TTcYiX4XksEYp3niNsl7yoKX8sbItKVSMFuuOPRa2k8 wamAjReJF9rBjzecWwdDJ+kGtwD82hSZbXf+QLvvD3VrhlpVD8B35lZk1XRiZgTtcZRi 4TqQ== X-Gm-Message-State: AJcUukd5v3boFgAyX+elRpcNR4uZBsl9X4uUISeG2V/kXKzYN5IhrxWo 1raPZhP9rrtOEmvSS4/axFZ7MuzE X-Google-Smtp-Source: AFSGD/VFxrSkiZuAraGWDAB7Grb0IWxJ+BnZpthOB2+tjiZyY5YR7C+Ny6QMYHglt5kY/tgYOnuQnA== X-Received: by 2002:a1c:934e:: with SMTP id v75mr6646222wmd.126.1545489339946; Sat, 22 Dec 2018 06:35:39 -0800 (PST) Received: from debian64.daheim (p4FD094B4.dip0.t-ipconnect.de. [79.208.148.180]) by smtp.gmail.com with ESMTPSA id d2sm12080954wrs.97.2018.12.22.06.35.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 06:35:39 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1gaiNO-0005dc-BS; Sat, 22 Dec 2018 15:35:38 +0100 From: Christian Lamparter To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2] powerpc/4xx/ocm: fix compilation error Date: Sat, 22 Dec 2018 15:35:38 +0100 Message-Id: <20181222143538.21630-1-chunkeey@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Mackerras , Markus Elfring Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This patch fixes a recent compilation regression in ocm: | ocm.c: In function ‘ocm_init_node’: | ocm.c:182:18: error: invalid operands to binary | | (have ‘int’ and ‘pgprot_t’ {aka ‘struct ’}) | _PAGE_EXEC | PAGE_KERNEL_NCG); | ^ | | ocm.c:197:17: error: invalid operands to binary | | (have ‘int’ and ‘pgprot_t’ {aka ‘struct ’}) | _PAGE_EXEC | PAGE_KERNEL); | ^ Fixes: 56f3c1413f5c ("powerpc/mm: properly set PAGE_KERNEL flags in ioremap()") Signed-off-by: Christian Lamparter Reviewed-by: Christophe Leroy --- arch/powerpc/platforms/4xx/ocm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c index 561b09de69bf..de3565353153 100644 --- a/arch/powerpc/platforms/4xx/ocm.c +++ b/arch/powerpc/platforms/4xx/ocm.c @@ -179,7 +179,7 @@ static void __init ocm_init_node(int count, struct device_node *node) /* ioremap the non-cached region */ if (ocm->nc.memtotal) { ocm->nc.virt = __ioremap(ocm->nc.phys, ocm->nc.memtotal, - _PAGE_EXEC | PAGE_KERNEL_NCG); + _PAGE_EXEC | pgprot_val(PAGE_KERNEL_NCG)); if (!ocm->nc.virt) { printk(KERN_ERR @@ -194,7 +194,7 @@ static void __init ocm_init_node(int count, struct device_node *node) if (ocm->c.memtotal) { ocm->c.virt = __ioremap(ocm->c.phys, ocm->c.memtotal, - _PAGE_EXEC | PAGE_KERNEL); + _PAGE_EXEC | pgprot_val(PAGE_KERNEL)); if (!ocm->c.virt) { printk(KERN_ERR