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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C890C433EF for ; Wed, 1 Jun 2022 00:41:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344276AbiFAAlu (ORCPT ); Tue, 31 May 2022 20:41:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232296AbiFAAlt (ORCPT ); Tue, 31 May 2022 20:41:49 -0400 Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B540D110B; Tue, 31 May 2022 17:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1654044103; bh=gAA/T6RmFtJ8e1KmZkGo7oW84DFSEfMlvKn6/ylyuf0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=uhjVYNRyqBoD6KwGoMOam9BA2X3FFe4lh4HVCU56n5uxcuDR8qAjGPmL87LsIT0Qc W0+AUC8UNdzT31FvW+2zBxeC7+eJTsyV/VHrypPQhnc3qNSc+ORdo/bR0vVYuNYh4j 0CK2jp+rnLLoUsef2u6AaRh9KuelLXGg/BK8K9cI= Received: from [192.168.9.172] (unknown [101.88.28.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id B8D83600FF; Wed, 1 Jun 2022 08:41:42 +0800 (CST) Message-ID: <1dbaed5d-fb83-be70-85fc-4b819fa7d47c@xen0n.name> Date: Wed, 1 Jun 2022 08:41:42 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:103.0) Gecko/20100101 Thunderbird/103.0a1 Subject: Re: [musl] Re: [GIT PULL] asm-generic changes for 5.19 To: Arnd Bergmann , Huacai Chen Cc: musl@lists.openwall.com, WANG Xuerui , Linus Torvalds , linux-arch , GNU C Library , Yoshinori Sato , Peter Zijlstra , Marc Zyngier , Masahiro Yamada , Linux Kernel Mailing List , Jiaxun Yang , ACPI Devel Maling List , Jianmin Lv , linux-pci , Ard Biesheuvel , Huacai Chen References: <358025d1-28e6-708b-d23d-3f22ae12a800@xen0n.name> Content-Language: en-US From: WANG Xuerui In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On 6/1/22 04:40, Arnd Bergmann wrote: > lib/test_printf.c:215: warning: "PTR" redefined > 215 | #define PTR ((void *)0xffff0123456789abUL) > | > In file included from /git/arm-soc/arch/loongarch/include/asm/vdso/vdso.h:9, > from > /git/arm-soc/arch/loongarch/include/asm/vdso/gettimeofday.h:13, > from /git/arm-soc/include/vdso/datapage.h:137, > from /git/arm-soc/arch/loongarch/include/asm/vdso.h:11, > from /git/arm-soc/arch/loongarch/include/asm/elf.h:13, > from /git/arm-soc/include/linux/elf.h:6, > from /git/arm-soc/include/linux/module.h:19, > from /git/arm-soc/lib/test_printf.c:10: > /git/arm-soc/arch/loongarch/include/asm/asm.h:182: note: this is the > location of the previous definition > 182 | #define PTR .dword > | > > Not sure what the best fix is for this, maybe the contents of asm/asm.h could > just be hidden in an "#idef __ASSEMBLER__" check. This can be a follow-up > patch when the branch is merged. Ah, the dreaded PTR... This has plagued Loongson users since antiquity (i.e. the MIPS era). It must have been the case that the arch/loongarch was based on an earlier version of arch/mips, that didn't have the commit fa62f39dc7e25 ("MIPS: Fix build error due to PTR used in more places"). So the fix would be simple: just rename the PTR to something else. MIPS changed that to PTR_WD and maybe we could re-use that name. But I agree that wrapping the whole asm/asm.h with an #ifdef __ASSEMBLY__ is very reasonable regardless. Maybe both could be done.