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=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 3A9E6C2D0D2 for ; Mon, 23 Dec 2019 22:01:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DDD320709 for ; Mon, 23 Dec 2019 22:01:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577138514; bh=cvBxc4WmSagTT1y4VAUM0/tpLY90rFtmuzPh60X44l0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=EL7sLYECrWg5iWnuFWReAzseBfzy88Tf0cYG4Im83rOd7eTA1C2Z7dfvNhsfRVBGi EcxuviZKwi4pP2dr7wQIeG1rSiXE5YelJ4Fjj+RaAsaKMaR6rAthixU/JQy8zhaxN/ bNVRN7hrrZYZBACtGj3lWtGXglMP+IQT9QC+qwrQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726934AbfLWWBx (ORCPT ); Mon, 23 Dec 2019 17:01:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:33156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726817AbfLWWBw (ORCPT ); Mon, 23 Dec 2019 17:01:52 -0500 Received: from X1 (nat-ab2241.sltdut.senawave.net [162.218.216.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A6D4206B7; Mon, 23 Dec 2019 22:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577138512; bh=cvBxc4WmSagTT1y4VAUM0/tpLY90rFtmuzPh60X44l0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=dUQyymDZpS8ieDiLpX7hkhz6mBdQuLmrcPET7KIRfHOhXojpwj0s0BlzgLCJpWaj2 E2oPEZcZqqs4seNr/Mu0YH/rkQXPgdtJN03vRggrcdL7QWwnRzd8IAOxWfdZZ9GSjA 37rmBkc5T3XJVAHC7iLWSs0+PEpIHWksAKbeBCvA= Date: Mon, 23 Dec 2019 14:01:51 -0800 From: Andrew Morton To: Christoph Hellwig Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Nick Desaulniers Subject: Re: linux-next: manual merge of the akpm-current tree with the generic-ioremap tree Message-Id: <20191223140151.7aceb059297338f5912b0f35@linux-foundation.org> In-Reply-To: <20191221083211.GA3465@lst.de> References: <20191218133025.15356802@canb.auug.org.au> <20191221083211.GA3465@lst.de> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 21 Dec 2019 09:32:11 +0100 Christoph Hellwig wrote: > Andrew, > > do you plan to send this to Linus for 5.5 to fix the warning from the > new devm_ioremap_uc addition in this cycle? If so I can rebase the > ioremap tree one more time. I'm not sure what to do about this because of https://lore.kernel.org/lkml/CAMuHMdUO=cZMsFx4t_uULNRuwnGLjbRYOJAo7j5gC-iSV3wy5w@mail.gmail.com/ I'd rather just drop the patch. Can you please take care of it all? From: Nick Desaulniers Subject: hexagon: define ioremap_uc Similar to commit 38e45d81d14e ("sparc64: implement ioremap_uc") define ioremap_uc for hexagon to avoid errors from -Wimplicit-function-definition. Link: http://lkml.kernel.org/r/20191209222956.239798-2-ndesaulniers@google.com Link: https://github.com/ClangBuiltLinux/linux/issues/797 Fixes: e537654b7039 ("lib: devres: add a helper function for ioremap_uc") Signed-off-by: Nick Desaulniers Suggested-by: Nathan Chancellor Acked-by: Brian Cain Cc: Lee Jones Cc: Andy Shevchenko Cc: Tuowen Zhao Cc: Mika Westerberg Cc: Luis Chamberlain Cc: Greg Kroah-Hartman Cc: Alexios Zavras Cc: Allison Randal Cc: Will Deacon Cc: Richard Fontana Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Boqun Feng Cc: Ingo Molnar Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton --- arch/hexagon/include/asm/io.h | 1 + 1 file changed, 1 insertion(+) --- a/arch/hexagon/include/asm/io.h~hexagon-define-ioremap_uc +++ a/arch/hexagon/include/asm/io.h @@ -173,6 +173,7 @@ static inline void writel(u32 data, vola void __iomem *ioremap(unsigned long phys_addr, unsigned long size); #define ioremap_nocache ioremap +#define ioremap_uc(X, Y) ioremap((X), (Y)) #define __raw_writel writel _