From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFE2D27A93B for ; Tue, 10 Jun 2025 07:26:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.67 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749540392; cv=none; b=YWsZKY3BBC6Iekqgz8BIiORT5ikVC4kgFJE1tVclgKF5aqMrNrVSZHhDU2Vc62fY2ibIusHm7SCA96z9xOn+bDTeKZBHYy0PDUPkcmnLxjDQjjjiqD5dRUFgXIwGhGwK+DauHIA5k72vlHp9NB7Qie5eemHZoBDwdxQESyewxyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749540392; c=relaxed/simple; bh=T+CjI/BtZil+fcwt4iAfiqj+VeXBzHaVbluTjLSffJ8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=GPcKn1IN1MJO+EhnfWFHpzN+mlczc0QzvMtw10NkZRPUdI8ERc0LD0OXD9JEP/z9OFgJTNhDirqAUnUi3BOPV5uHz06QyCExwsZm9UXDpX3l+XeRq+2LRNHhJ+xRmW9M6eV2kbi6NVLxF7WPoxtOyYvibslzIJx86MOMrxr9qxU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=monstr.eu; spf=none smtp.mailfrom=monstr.eu; dkim=pass (2048-bit key) header.d=monstr-eu.20230601.gappssmtp.com header.i=@monstr-eu.20230601.gappssmtp.com header.b=0XyqZRGa; arc=none smtp.client-ip=209.85.218.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=monstr.eu Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=monstr.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=monstr-eu.20230601.gappssmtp.com header.i=@monstr-eu.20230601.gappssmtp.com header.b="0XyqZRGa" Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-ade326e366dso534193366b.3 for ; Tue, 10 Jun 2025 00:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20230601.gappssmtp.com; s=20230601; t=1749540386; x=1750145186; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=cVjK0599UkeAIvQVZ6e3BYBbqIwF7FaraC94wRTpRos=; b=0XyqZRGa7+IncYk+xGRPqMfh6Kg+EOsdAYV7bJ67RkUYPDXaW2LdqGCJGOSabA5PbI fo7Kwh6elYZ2LY6sZwc2fyV9EF5/bZL/YRYkXK74iuPej9h3QEsO7/ueo2tJLba8puGU Hx9C0x3FvhR2o/5LrYiTwSskd9yyUkNqDdSWk46HpQVBqLTunhxA8sFiKLI9xn6d+E/s dEZ7SyNEHQYJWkWF3nM+UNwGiOvfgN6e8rqiefHQYwnYPDsD2jyE3iJssyaE2rehu1d+ uRvL+b1f1T3qPK2tA1DKHFryfXyHY1MgFxfaB1gArR0MMkbTibpASJjvrrZQUBdfqW9L r4jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749540386; x=1750145186; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cVjK0599UkeAIvQVZ6e3BYBbqIwF7FaraC94wRTpRos=; b=nS1eG86AIigBs4UtZf7oKQLHTCElhblHqCRZ+ZrYPjh11GP1Z456OUEjdJvGopr7zQ wSc/yHcLZIfNqcjTbc2MJmJwM30RhWqf21Vl0AuXeGAa9kL5xuIC8J6n0RZQnAi1Jsz1 ipPpj5/RHvcWouLNGfzNow7iv+WaFUH5HUWvI4HuE0VLbK1llW+xhtOFEw+/n4Pa5f16 /CpgD+kG8uXlQJMmWJTKi2T7ogD5ezhzOn9tGcyvoMmlBcJ65zEBOPUJYXt7kXm6Ylw2 8mnEcMJGMnRdP2nB772K7UmZC2/A3UlvxXrVBVD88rgF2O7k8UR52hQ1KSOiU+GpvhO2 BNNw== X-Forwarded-Encrypted: i=1; AJvYcCX8Fg5UGPrfiq7C+IOyIHAYPgXTTeldGDG/f+XBZYpd/w87TDKxwpnmv8TPmrwlrLg61bWdTLXEzGv8CDg=@vger.kernel.org X-Gm-Message-State: AOJu0YwQPsBH9uP2SQ9ktYFJv75nGnxboqnixFn1jEX3PqmlRwJOf/K1 70r0GwaQ1PnkawiqkZZ0ogAob9wMlYtPSMmKIUGwSgSJ04xc+TJ7hN9VsX0/q3YEng== X-Gm-Gg: ASbGnct1jMVK1MF1ph6xhaVwVEFUpUX2km8P9OJica8xakVREqt9D1N0th1k16CkaVB D/7/6uAzv1PRI40Ut2VT7XZXYNgS7i/LpqduGbEnwZVS5prjSP5XBac80hQBOMOlpPP01Je+sBx UGjeTw7JJBfg49EsdQVi8zvT/7Qr9al+mVv+YPl1iVhmrdOIl0dbcUhZT1GpdatnUTu71ROvigD mEuJiiLa0JlvV5uUdKaBOcoGcj5m6v52iF4NBT2z/FgYhh/P1iV20JvU3ectR7c8L5m3L685m7G ExOnWzqQGrK4AiJde6uO3kq5gOOaqy82LOb2n8jImbWMVd+wyD59mpsYz5CfnLFsu43QD/Xc90p B21T1qXZFCAYo X-Google-Smtp-Source: AGHT+IEBvQxRMDVoP2AITAODVdA+VN6fP/bXnF8ZVcuQpzrtSJTxLVJCPNRwSZsc99F+/j1teDbelw== X-Received: by 2002:a17:907:c27:b0:ade:8a6:b877 with SMTP id a640c23a62f3a-ade1a916cd9mr1427519866b.5.1749540385452; Tue, 10 Jun 2025 00:26:25 -0700 (PDT) Received: from [192.168.0.105] (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ade1dc7c724sm680989366b.175.2025.06.10.00.26.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Jun 2025 00:26:25 -0700 (PDT) Message-ID: <546019cd-32db-4374-b73c-4cb37943a6cb@monstr.eu> Date: Tue, 10 Jun 2025 09:26:24 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers To: Thomas Huth , linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-arch@vger.kernel.org References: <20250314071013.1575167-1-thuth@redhat.com> <20250314071013.1575167-19-thuth@redhat.com> Content-Language: en-US From: Michal Simek In-Reply-To: <20250314071013.1575167-19-thuth@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/14/25 08:09, Thomas Huth wrote: > While the GCC and Clang compilers already define __ASSEMBLER__ > automatically when compiling assembly code, __ASSEMBLY__ is a > macro that only gets defined by the Makefiles in the kernel. > This can be very confusing when switching between userspace > and kernelspace coding, or when dealing with uapi headers that > rather should use __ASSEMBLER__ instead. So let's standardize on > the __ASSEMBLER__ macro that is provided by the compilers now. > > This is a completely mechanical patch (done with a simple "sed -i" > statement). > > Cc: Michal Simek > Signed-off-by: Thomas Huth > --- > arch/microblaze/include/asm/asm-compat.h | 2 +- > arch/microblaze/include/asm/current.h | 4 ++-- > arch/microblaze/include/asm/entry.h | 4 ++-- > arch/microblaze/include/asm/exceptions.h | 4 ++-- > arch/microblaze/include/asm/fixmap.h | 4 ++-- > arch/microblaze/include/asm/ftrace.h | 2 +- > arch/microblaze/include/asm/kgdb.h | 4 ++-- > arch/microblaze/include/asm/mmu.h | 4 ++-- > arch/microblaze/include/asm/page.h | 8 ++++---- > arch/microblaze/include/asm/pgtable.h | 18 +++++++++--------- > arch/microblaze/include/asm/processor.h | 8 ++++---- > arch/microblaze/include/asm/ptrace.h | 4 ++-- > arch/microblaze/include/asm/sections.h | 4 ++-- > arch/microblaze/include/asm/setup.h | 4 ++-- > arch/microblaze/include/asm/thread_info.h | 4 ++-- > arch/microblaze/include/asm/unistd.h | 4 ++-- > .../microblaze/include/asm/xilinx_mb_manager.h | 4 ++-- > 17 files changed, 43 insertions(+), 43 deletions(-) > > diff --git a/arch/microblaze/include/asm/asm-compat.h b/arch/microblaze/include/asm/asm-compat.h > index c05259ce2d2c2..9f04614762319 100644 > --- a/arch/microblaze/include/asm/asm-compat.h > +++ b/arch/microblaze/include/asm/asm-compat.h > @@ -4,7 +4,7 @@ > > #include > > -#ifdef __ASSEMBLY__ > +#ifdef __ASSEMBLER__ > # define stringify_in_c(...) __VA_ARGS__ > # define ASM_CONST(x) x > #else > diff --git a/arch/microblaze/include/asm/current.h b/arch/microblaze/include/asm/current.h > index a4bb45be30e69..099e69f32bf97 100644 > --- a/arch/microblaze/include/asm/current.h > +++ b/arch/microblaze/include/asm/current.h > @@ -14,13 +14,13 @@ > * but check asm/microblaze/kernel/entry.S to be sure. > */ > #define CURRENT_TASK r31 > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > /* > * Dedicate r31 to keeping the current task pointer > */ > register struct task_struct *current asm("r31"); > > # define get_current() current > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > > #endif /* _ASM_MICROBLAZE_CURRENT_H */ > diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h > index 6c42bed411662..9efadf12397ca 100644 > --- a/arch/microblaze/include/asm/entry.h > +++ b/arch/microblaze/include/asm/entry.h > @@ -21,7 +21,7 @@ > > #define PER_CPU(var) var > > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */ > DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */ > DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */ > @@ -29,6 +29,6 @@ DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ > DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */ > > extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall); > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > > #endif /* _ASM_MICROBLAZE_ENTRY_H */ > diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h > index 967f175173e14..c4591e4f7175b 100644 > --- a/arch/microblaze/include/asm/exceptions.h > +++ b/arch/microblaze/include/asm/exceptions.h > @@ -11,7 +11,7 @@ > #define _ASM_MICROBLAZE_EXCEPTIONS_H > > #ifdef __KERNEL__ > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > /* Macros to enable and disable HW exceptions in the MSR */ > /* Define MSR enable bit for HW exceptions */ > @@ -64,6 +64,6 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig); > void die(const char *str, struct pt_regs *fp, long err); > void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr); > > -#endif /*__ASSEMBLY__ */ > +#endif /*__ASSEMBLER__ */ > #endif /* __KERNEL__ */ > #endif /* _ASM_MICROBLAZE_EXCEPTIONS_H */ > diff --git a/arch/microblaze/include/asm/fixmap.h b/arch/microblaze/include/asm/fixmap.h > index e6e9288bff761..f9797849e4d43 100644 > --- a/arch/microblaze/include/asm/fixmap.h > +++ b/arch/microblaze/include/asm/fixmap.h > @@ -15,7 +15,7 @@ > #ifndef _ASM_FIXMAP_H > #define _ASM_FIXMAP_H > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > #include > #include > #ifdef CONFIG_HIGHMEM > @@ -62,5 +62,5 @@ extern void __set_fixmap(enum fixed_addresses idx, > > #include > > -#endif /* !__ASSEMBLY__ */ > +#endif /* !__ASSEMBLER__ */ > #endif > diff --git a/arch/microblaze/include/asm/ftrace.h b/arch/microblaze/include/asm/ftrace.h > index 4ca38b92a3a20..27c1bafb669c3 100644 > --- a/arch/microblaze/include/asm/ftrace.h > +++ b/arch/microblaze/include/asm/ftrace.h > @@ -7,7 +7,7 @@ > #define MCOUNT_ADDR ((unsigned long)(_mcount)) > #define MCOUNT_INSN_SIZE 8 /* sizeof mcount call */ > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > extern void _mcount(void); > extern void ftrace_call_graph(void); > void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr); > diff --git a/arch/microblaze/include/asm/kgdb.h b/arch/microblaze/include/asm/kgdb.h > index 8dc5ebb07fd5a..321c3c8bfcf27 100644 > --- a/arch/microblaze/include/asm/kgdb.h > +++ b/arch/microblaze/include/asm/kgdb.h > @@ -3,7 +3,7 @@ > #ifndef __MICROBLAZE_KGDB_H__ > #define __MICROBLAZE_KGDB_H__ > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > #define CACHE_FLUSH_IS_SAFE 1 > #define BUFMAX 2048 > @@ -27,6 +27,6 @@ static inline void arch_kgdb_breakpoint(void) > struct pt_regs; > asmlinkage void microblaze_kgdb_break(struct pt_regs *regs); > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > #endif /* __MICROBLAZE_KGDB_H__ */ > #endif /* __KERNEL__ */ > diff --git a/arch/microblaze/include/asm/mmu.h b/arch/microblaze/include/asm/mmu.h > index b928a87c00766..7262dc4da3385 100644 > --- a/arch/microblaze/include/asm/mmu.h > +++ b/arch/microblaze/include/asm/mmu.h > @@ -9,7 +9,7 @@ > #define _ASM_MICROBLAZE_MMU_H > > # ifdef __KERNEL__ > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > > /* Default "unsigned long" context */ > typedef unsigned long mm_context_t; > @@ -56,7 +56,7 @@ extern void _tlbia(void); /* invalidate all TLB entries */ > * mapping has to increase tlb_skip size. > */ > extern u32 tlb_skip; > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > > /* > * The MicroBlaze processor has a TLB architecture identical to PPC-40x. The > diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h > index 90fc9c81debda..90ac9f34b4b49 100644 > --- a/arch/microblaze/include/asm/page.h > +++ b/arch/microblaze/include/asm/page.h > @@ -25,7 +25,7 @@ > > #define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */ > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > /* > * PAGE_OFFSET -- the first address of the first page of memory. With MMU > @@ -100,7 +100,7 @@ extern int page_is_ram(unsigned long pfn); > # define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT) > > # define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT) > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > > /* Convert between virtual and physical address for MMU. */ > /* Handle MicroBlaze processor with virtual memory. */ > @@ -113,7 +113,7 @@ extern int page_is_ram(unsigned long pfn); > #define tovirt(rd, rs) \ > addik rd, rs, (CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR) > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > # define __pa(x) __virt_to_phys((unsigned long)(x)) > # define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) > @@ -130,7 +130,7 @@ static inline const void *pfn_to_virt(unsigned long pfn) > > #define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr))) > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > #define TOPHYS(addr) __virt_to_phys(addr) > > diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h > index e4ea2ec3642f0..eadc73d22dda6 100644 > --- a/arch/microblaze/include/asm/pgtable.h > +++ b/arch/microblaze/include/asm/pgtable.h > @@ -10,14 +10,14 @@ > > #include > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > extern int mem_init_done; > #endif > > #include > > #ifdef __KERNEL__ > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > #include > #include > @@ -39,7 +39,7 @@ extern pte_t *va_to_pte(unsigned long address); > #define VMALLOC_START (CONFIG_KERNEL_START + CONFIG_LOWMEM_SIZE) > #define VMALLOC_END ioremap_bot > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > /* > * Macro to mark a page protection value as "uncacheable". > @@ -208,7 +208,7 @@ extern pte_t *va_to_pte(unsigned long address); > * Also, write permissions imply read permissions. > */ > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > /* > * ZERO_PAGE is a global shared page that is always zero: used > * for zero-mapped memory areas etc.. > @@ -216,7 +216,7 @@ extern pte_t *va_to_pte(unsigned long address); > extern unsigned long empty_zero_page[1024]; > #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > #define pte_none(pte) ((pte_val(pte) & ~_PTE_NONE_MASK) == 0) > #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT) > @@ -237,7 +237,7 @@ extern unsigned long empty_zero_page[1024]; > #define pfn_pte(pfn, prot) \ > __pte(((pte_basic_t)(pfn) << PFN_PTE_SHIFT) | pgprot_val(prot)) > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > /* > * The following only work if pte_present() is true. > * Undefined behaviour if not.. > @@ -444,13 +444,13 @@ extern int mem_init_done; > > asmlinkage void __init mmu_init(void); > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > #endif /* __KERNEL__ */ > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > extern unsigned long ioremap_bot, ioremap_base; > > void setup_memory(void); > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > #endif /* _ASM_MICROBLAZE_PGTABLE_H */ > diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h > index 4e193c7550dfa..d59bdfffca7cc 100644 > --- a/arch/microblaze/include/asm/processor.h > +++ b/arch/microblaze/include/asm/processor.h > @@ -14,7 +14,7 @@ > #include > #include > > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > /* from kernel/cpu/mb.c */ > extern const struct seq_operations cpuinfo_op; > > @@ -29,7 +29,7 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp); > extern void ret_from_fork(void); > extern void ret_from_kernel_thread(void); > > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > > /* > * This is used to define STACK_TOP, and with MMU it must be below > @@ -45,7 +45,7 @@ extern void ret_from_kernel_thread(void); > > # define THREAD_KSP 0 > > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > > /* If you change this, you must change the associated assembly-languages > * constants defined below, THREAD_*. > @@ -88,5 +88,5 @@ unsigned long __get_wchan(struct task_struct *p); > extern struct dentry *of_debugfs_root; > #endif > > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > #endif /* _ASM_MICROBLAZE_PROCESSOR_H */ > diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h > index bfcb89df5e26f..17982292a64fd 100644 > --- a/arch/microblaze/include/asm/ptrace.h > +++ b/arch/microblaze/include/asm/ptrace.h > @@ -7,7 +7,7 @@ > > #include > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > #define kernel_mode(regs) ((regs)->pt_mode) > #define user_mode(regs) (!kernel_mode(regs)) > > @@ -20,5 +20,5 @@ static inline long regs_return_value(struct pt_regs *regs) > return regs->r3; > } > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > #endif /* _ASM_MICROBLAZE_PTRACE_H */ > diff --git a/arch/microblaze/include/asm/sections.h b/arch/microblaze/include/asm/sections.h > index a9311ad84a67f..f5008f5e7a5c1 100644 > --- a/arch/microblaze/include/asm/sections.h > +++ b/arch/microblaze/include/asm/sections.h > @@ -10,11 +10,11 @@ > > #include > > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > extern char _ssbss[], _esbss[]; > extern unsigned long __ivt_start[], __ivt_end[]; > > extern u32 _fdt_start[], _fdt_end[]; > > -# endif /* !__ASSEMBLY__ */ > +# endif /* !__ASSEMBLER__ */ > #endif /* _ASM_MICROBLAZE_SECTIONS_H */ > diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h > index bf2600f759593..837ed0bbae4b5 100644 > --- a/arch/microblaze/include/asm/setup.h > +++ b/arch/microblaze/include/asm/setup.h > @@ -9,7 +9,7 @@ > > #include > > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > extern char cmd_line[COMMAND_LINE_SIZE]; > > extern char *klimit; > @@ -25,5 +25,5 @@ void machine_shutdown(void); > void machine_halt(void); > void machine_power_off(void); > > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > #endif /* _ASM_MICROBLAZE_SETUP_H */ > diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h > index a0ddd2a36fb94..0153f7c2717c9 100644 > --- a/arch/microblaze/include/asm/thread_info.h > +++ b/arch/microblaze/include/asm/thread_info.h > @@ -13,7 +13,7 @@ > #define THREAD_SIZE (1 << THREAD_SHIFT) > #define THREAD_SIZE_ORDER 1 > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > # include > # include > > @@ -86,7 +86,7 @@ static inline struct thread_info *current_thread_info(void) > } > > /* thread information allocation */ > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > /* > * thread information flags > diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h > index cfe3f888b432b..fedda9908aa94 100644 > --- a/arch/microblaze/include/asm/unistd.h > +++ b/arch/microblaze/include/asm/unistd.h > @@ -8,7 +8,7 @@ > > #include > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > /* #define __ARCH_WANT_OLD_READDIR */ > /* #define __ARCH_WANT_OLD_STAT */ > @@ -33,6 +33,6 @@ > #define __ARCH_WANT_SYS_VFORK > #define __ARCH_WANT_SYS_FORK > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > #endif /* _ASM_MICROBLAZE_UNISTD_H */ > diff --git a/arch/microblaze/include/asm/xilinx_mb_manager.h b/arch/microblaze/include/asm/xilinx_mb_manager.h > index 7b6995722b0c0..121a3224882b2 100644 > --- a/arch/microblaze/include/asm/xilinx_mb_manager.h > +++ b/arch/microblaze/include/asm/xilinx_mb_manager.h > @@ -5,7 +5,7 @@ > #ifndef _XILINX_MB_MANAGER_H > #define _XILINX_MB_MANAGER_H > > -# ifndef __ASSEMBLY__ > +# ifndef __ASSEMBLER__ > > #include > > @@ -21,7 +21,7 @@ void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val, > void *priv, void (*reset_callback)(void *data)); > asmlinkage void xmb_inject_err(void); > > -# endif /* __ASSEMBLY__ */ > +# endif /* __ASSEMBLER__ */ > > /* Error injection offset */ > #define XMB_INJECT_ERR_OFFSET 0x200 $ git grep ASSEMBLY arch/microblaze/ arch/microblaze/include/uapi/asm/ptrace.h:13:#ifndef __ASSEMBLY__ arch/microblaze/include/uapi/asm/ptrace.h:71:#endif /* __ASSEMBLY__ */ This should be fixed too. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs