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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 78EF6C5B552 for ; Tue, 10 Jun 2025 16:01:58 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4bGtp56wjYz3bnc; Wed, 11 Jun 2025 02:01:49 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1749571309; cv=none; b=LHu35gbuB1Snumn5qDgLHixjqyq99IfjkbGfqN5s4bkiDKaPK6cFPeq3w39yv6IRvwsGQo0+cVKTWXdPkeEOonjyhYqmOo+i4PkbNiZQZE5GP3UsDSuac9RVBuLS5LrELVJyOFwDZzbiFgyjjlbrjD6xaVaV0QF3cSGtbnSJ/DUgq7QL0HTp30lgz6QYSP5LPrEHObEQBYOA5VuXEyioV3TG77vQpoJWneKCVU0jrR8GJGdJ/hL7uA19yvsKIjJkbcde0NUYSX+vLuRfVq9E1WPgjZ2VDl46hsNXsGIm6WSJz242LE24jhqTJU5WMI88MbmK5eWm/oBpIWH8nRjHeQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1749571309; c=relaxed/relaxed; bh=eNC4i547XfVjzpc9CY/3VfJyr7zDb4GwhTGHaWkcyV4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:content-type; b=j1iBYKFe6dJH0zl1j/iL41EwLE5jjkrCfQAVJScpBH9yC2H3EcCjghAB22tw0n3UVrJbhRppjM5fiqOjSPjtMS4NJA5p+JIpl5nbOHAwgf/UF3DSPA523zXxNn3aLxbAqolYpAv0XfgCIHZJJw1DKGcc63jl8B+/UAe8K9XoDqPyMwGED6Q6C5o4RHKQlrR98tWqK38IkaV7zMm9tUfuAswXe4aqsZf/1Cg98QL6dER77U+uks1dS5mZrWsGdtFLcqyQs5E8V0mSMPNwYWWfvNxnz60pAe3j9rNu/e7WAXyuxH7WEjiy2RG/5MEidhbrrdXT7LLEOk3de1HEffMUnQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a/HQrU7J; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a/HQrU7J; dkim-atps=neutral; spf=pass (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=thuth@redhat.com; receiver=lists.ozlabs.org) smtp.mailfrom=redhat.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a/HQrU7J; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a/HQrU7J; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=thuth@redhat.com; receiver=lists.ozlabs.org) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4bGtp40xPxz3bnm for ; Wed, 11 Jun 2025 02:01:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749571301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNC4i547XfVjzpc9CY/3VfJyr7zDb4GwhTGHaWkcyV4=; b=a/HQrU7JkOlm1ic3Zmfqv6JcHHKPUijz1hBBN3iv/Y4MhNWhqzPYW8iTFa0CVgIzQSP1r8 Mo1G+3m0EV91yPdPkuIFq6iCSRQwc6Zfxu8nOM1m9r9d+hPW4hOxzw5MPeR4DAsEmuCAla WLdmCmS76cNYHw6SmRnOXSOxajZ9d5g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749571301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNC4i547XfVjzpc9CY/3VfJyr7zDb4GwhTGHaWkcyV4=; b=a/HQrU7JkOlm1ic3Zmfqv6JcHHKPUijz1hBBN3iv/Y4MhNWhqzPYW8iTFa0CVgIzQSP1r8 Mo1G+3m0EV91yPdPkuIFq6iCSRQwc6Zfxu8nOM1m9r9d+hPW4hOxzw5MPeR4DAsEmuCAla WLdmCmS76cNYHw6SmRnOXSOxajZ9d5g= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-212-j_JhX8PWNRmyr3sDdtxcuw-1; Tue, 10 Jun 2025 12:01:38 -0400 X-MC-Unique: j_JhX8PWNRmyr3sDdtxcuw-1 X-Mimecast-MFC-AGG-ID: j_JhX8PWNRmyr3sDdtxcuw_1749571294 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 31CB9195422A; Tue, 10 Jun 2025 16:01:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.89]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BD0B21956096; Tue, 10 Jun 2025 16:01:30 +0000 (UTC) From: Thomas Huth To: linuxppc-dev@lists.ozlabs.org, Madhavan Srinivasan , Michael Ellerman Cc: Nicholas Piggin , Christophe Leroy , Geoff Levand , Naveen N Rao Subject: [PATCH v2 0/2] powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Date: Tue, 10 Jun 2025 18:01:26 +0200 Message-ID: <20250610160128.69033-1-thuth@redhat.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: UvFy7TTLegCno80e8jezRAyy2ORX2X1iN6-s9OgXFGw_1749571294 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true The kernel Makefiles define the __ASSEMBLY__ macro to provide a way to use headers in both, assembly and C source code. However, all the supported versions of the GCC and Clang compilers also define the macro __ASSEMBLER__ automatically already when compiling assembly code, so some kernel headers are using __ASSEMBLER__ instead. With regards to userspace code, this seems also to be constant source of confusion, see for example these links here: https://lore.kernel.org/kvm/20250222014526.2302653-1-seanjc@google.com/ https://stackoverflow.com/questions/28924355/gcc-assembler-preprocessor-not-compatible-with-standard-headers https://forums.raspberrypi.com/viewtopic.php?p=1652944#p1653834 https://github.com/riscv-software-src/opensbi/issues/199 To avoid confusion in the future, it would make sense to standardize on the macro that gets defined by the compiler, so this patch series changes all occurances of __ASSEMBLY__ into __ASSEMBLER__. I split the patches per architecture to ease the review, and I also split the uapi headers from the normal ones in case we decide that uapi needs to be treated differently from the normal headers here. The x86, parisc and sh patches already got merged via their specific architecture tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=24a295e4ef1ca8 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8a141be3233af7 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cccaea1d66e94b https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2b6a188625a2b https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9cc646950eefda So I assume the powerpc patches should go via the powerpc tree. v2: - Split the powerpc patches from the global series (see https://lore.kernel.org/all/20250314071013.1575167-1-thuth@redhat.com/) - Rebased the patches on linux-next and fixed the conflicts and new occurances of __ASSEMBLY__ Thomas Huth (2): powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers arch/powerpc/boot/page.h | 2 +- arch/powerpc/include/asm/asm-const.h | 2 +- arch/powerpc/include/asm/barrier.h | 2 +- arch/powerpc/include/asm/book3s/32/kup.h | 4 ++-- arch/powerpc/include/asm/book3s/32/mmu-hash.h | 8 ++++---- arch/powerpc/include/asm/book3s/32/pgtable.h | 12 ++++++------ arch/powerpc/include/asm/book3s/64/hash-4k.h | 4 ++-- arch/powerpc/include/asm/book3s/64/hash-64k.h | 4 ++-- arch/powerpc/include/asm/book3s/64/hash.h | 4 ++-- arch/powerpc/include/asm/book3s/64/kup.h | 6 +++--- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 12 ++++++------ arch/powerpc/include/asm/book3s/64/mmu.h | 8 ++++---- arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/include/asm/book3s/64/radix.h | 8 ++++---- arch/powerpc/include/asm/book3s/64/slice.h | 4 ++-- arch/powerpc/include/asm/bug.h | 14 +++++++------- arch/powerpc/include/asm/cache.h | 4 ++-- arch/powerpc/include/asm/cpu_has_feature.h | 4 ++-- arch/powerpc/include/asm/cpuidle.h | 2 +- arch/powerpc/include/asm/cputable.h | 8 ++++---- arch/powerpc/include/asm/cputhreads.h | 4 ++-- arch/powerpc/include/asm/dcr-native.h | 4 ++-- arch/powerpc/include/asm/dcr.h | 4 ++-- arch/powerpc/include/asm/epapr_hcalls.h | 4 ++-- arch/powerpc/include/asm/exception-64e.h | 2 +- arch/powerpc/include/asm/exception-64s.h | 6 +++--- arch/powerpc/include/asm/extable.h | 2 +- arch/powerpc/include/asm/feature-fixups.h | 6 +++--- arch/powerpc/include/asm/firmware.h | 4 ++-- arch/powerpc/include/asm/fixmap.h | 4 ++-- arch/powerpc/include/asm/ftrace.h | 8 ++++---- arch/powerpc/include/asm/head-64.h | 4 ++-- arch/powerpc/include/asm/hvcall.h | 4 ++-- arch/powerpc/include/asm/hw_irq.h | 4 ++-- arch/powerpc/include/asm/interrupt.h | 4 ++-- arch/powerpc/include/asm/irqflags.h | 2 +- arch/powerpc/include/asm/jump_label.h | 2 +- arch/powerpc/include/asm/kasan.h | 4 ++-- arch/powerpc/include/asm/kdump.h | 4 ++-- arch/powerpc/include/asm/kexec.h | 4 ++-- arch/powerpc/include/asm/kgdb.h | 4 ++-- arch/powerpc/include/asm/kup.h | 8 ++++---- arch/powerpc/include/asm/kvm_asm.h | 2 +- arch/powerpc/include/asm/kvm_book3s_asm.h | 6 +++--- arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 ++-- arch/powerpc/include/asm/lv1call.h | 4 ++-- arch/powerpc/include/asm/mmu.h | 8 ++++---- arch/powerpc/include/asm/mpc52xx.h | 12 ++++++------ arch/powerpc/include/asm/nohash/32/kup-8xx.h | 4 ++-- arch/powerpc/include/asm/nohash/32/mmu-44x.h | 4 ++-- arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 4 ++-- arch/powerpc/include/asm/nohash/32/pgtable.h | 12 ++++++------ arch/powerpc/include/asm/nohash/32/pte-8xx.h | 2 +- arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 8 ++++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 4 ++-- arch/powerpc/include/asm/nohash/kup-booke.h | 4 ++-- arch/powerpc/include/asm/nohash/mmu-e500.h | 4 ++-- arch/powerpc/include/asm/nohash/pgtable.h | 6 +++--- arch/powerpc/include/asm/nohash/pte-e500.h | 4 ++-- arch/powerpc/include/asm/opal-api.h | 4 ++-- arch/powerpc/include/asm/opal.h | 4 ++-- arch/powerpc/include/asm/page.h | 14 +++++++------- arch/powerpc/include/asm/page_32.h | 4 ++-- arch/powerpc/include/asm/page_64.h | 4 ++-- arch/powerpc/include/asm/pgtable.h | 8 ++++---- arch/powerpc/include/asm/ppc_asm.h | 4 ++-- arch/powerpc/include/asm/processor.h | 8 ++++---- arch/powerpc/include/asm/ptrace.h | 6 +++--- arch/powerpc/include/asm/reg.h | 6 +++--- arch/powerpc/include/asm/reg_booke.h | 4 ++-- arch/powerpc/include/asm/reg_fsl_emb.h | 4 ++-- arch/powerpc/include/asm/setup.h | 4 ++-- arch/powerpc/include/asm/smp.h | 4 ++-- arch/powerpc/include/asm/spu_csa.h | 4 ++-- arch/powerpc/include/asm/synch.h | 4 ++-- arch/powerpc/include/asm/thread_info.h | 8 ++++---- arch/powerpc/include/asm/tm.h | 4 ++-- arch/powerpc/include/asm/types.h | 4 ++-- arch/powerpc/include/asm/unistd.h | 4 ++-- arch/powerpc/include/asm/vdso.h | 6 +++--- arch/powerpc/include/asm/vdso/getrandom.h | 4 ++-- arch/powerpc/include/asm/vdso/gettimeofday.h | 4 ++-- arch/powerpc/include/asm/vdso/processor.h | 4 ++-- arch/powerpc/include/asm/vdso/vsyscall.h | 4 ++-- arch/powerpc/include/asm/vdso_datapage.h | 6 +++--- arch/powerpc/include/uapi/asm/opal-prd.h | 4 ++-- arch/powerpc/include/uapi/asm/ptrace.h | 12 ++++++------ arch/powerpc/include/uapi/asm/types.h | 4 ++-- arch/powerpc/kernel/head_booke.h | 4 ++-- arch/powerpc/net/bpf_jit.h | 2 +- arch/powerpc/platforms/powernv/subcore.h | 4 ++-- arch/powerpc/xmon/xmon_bpts.h | 4 ++-- .../selftests/powerpc/include/instructions.h | 2 +- 94 files changed, 240 insertions(+), 240 deletions(-) -- 2.49.0