From patchwork Mon Sep 21 09:22:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 520207 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D29E714012C for ; Mon, 21 Sep 2015 19:24:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=H1knAN3U; 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 AE51D1A0388 for ; Mon, 21 Sep 2015 19:24:31 +1000 (AEST) 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=H1knAN3U; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yk0-x22d.google.com (mail-yk0-x22d.google.com [IPv6:2607:f8b0:4002:c07::22d]) (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 176C91A0052 for ; Mon, 21 Sep 2015 19:23:14 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=H1knAN3U; dkim-atps=neutral Received: by ykdg206 with SMTP id g206so96750334ykd.1 for ; Mon, 21 Sep 2015 02:23:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=BLGYUJ2IkOPlmwjFbCB6wc4Yd/KBN7XL1wwy45M2jU8=; b=H1knAN3U9w+gHl1A9s4iUtaoyMjkkh5ePEukidAVI8fJUpfke7ZSRKgf3xC+lpWQVe HjtPXH9vF/V+4FCqxQFfBnkB6XEiKxbIyPUT/hDrttAWOcdiIV4m5u9sqfHPTUpPySao C5yUPuhRu7dcPZxut7BaArcg+eIriyGFf1PQDa+rFrizy4c/hXsIpErKZlgZcUea++72 TQV6NdzV34gzNO1I+GAvYmZSatzcDbzjwgoOAvtQFH+LxQKKJXnXxmoFHXguEWaErzHb M1VuHtxYw35uZrkpOfikUCkEXzhQYi+Ha4n7oHj8rO7o1gmiw8lkpCnqGOz4CXCLAlfP el/A== X-Received: by 10.170.220.213 with SMTP id m204mr15452633ykf.113.1442827390748; Mon, 21 Sep 2015 02:23:10 -0700 (PDT) Received: from pek-khao-d1.corp.ad.wrs.com (unknown-178-22.windriver.com. [147.11.178.22]) by smtp.gmail.com with ESMTPSA id b134sm3188774ywe.6.2015.09.21.02.23.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2015 02:23:09 -0700 (PDT) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc: fsl_pci: cast the regs->nip to void * when passing it to probe_kernel_address() Date: Mon, 21 Sep 2015 17:22:50 +0800 Message-Id: <1442827370-26854-1-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 2.4.3 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" With the reimplementation of probe_kernel_address() in commit ecc83243e1d4 ("uaccess: reimplement probe_kernel_address() using probe_kernel_read()"), the explication of the cast for the addr parameter has been dropped. So we have to explicitly cast the regs->nip to void * when passing it to probe_kernel_address() in order to fix the following build error: arch/powerpc/sysdev/fsl_pci.c: In function 'fsl_pci_mcheck_exception': arch/powerpc/sysdev/fsl_pci.c:1002:4: error: passing argument 2 of 'probe_kernel_read' makes pointer from integer without a cast [-Werror] ret = probe_kernel_address(regs->nip, inst); ^ Signed-off-by: Kevin Hao --- This is against linux-next. arch/powerpc/sysdev/fsl_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index ebc1f412cf49..13b9bcf5485e 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -999,7 +999,7 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs) ret = get_user(regs->nip, &inst); pagefault_enable(); } else { - ret = probe_kernel_address(regs->nip, inst); + ret = probe_kernel_address((void *)regs->nip, inst); } if (mcheck_handle_load(regs, inst)) {