sw64: unify header guard naming

Sunway inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG

--------------------------------

Use the canonical header guard naming of the full path to the header.
Signed-off-by: NMao Minkai <maominkai@wxiat.com>
Reviewed-by: NHe Sheng <hesheng@wxiat.com>
Signed-off-by: NGu Zitao <guzitao@wxiat.com>

arch/sw_64/include/asm/asm-offsets.h

@@ -4,4 +4,4 @@
 
 #include <generated/asm-offsets.h>
 
-#endif
+#endif /* _ASM_SW64_ASM_OFFSETS_H */

arch/sw_64/include/asm/asm-prototypes.h

@@ -19,4 +19,4 @@ extern void __remlu(void);
 extern void __divwu(void);
 extern void __remwu(void);
 
-#endif
+#endif /* _ASM_SW64_ASM_PROTOTYPES_H */

arch/sw_64/include/asm/bugs.h

@@ -6,4 +6,4 @@ static void check_bugs(void)
 {
 }
 
-#endif
+#endif /* _ASM_SW64_BUGS_H */

arch/sw_64/include/asm/cache.h

@@ -8,4 +8,4 @@
 #define L1_CACHE_SHIFT		7
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 
-#endif
+#endif /* _ASM_SW64_CACHE_H */

arch/sw_64/include/asm/checksum.h

@@ -123,4 +123,4 @@ static inline unsigned short from64to16(unsigned long x)
 	return out_v.us[0] + out_v.us[1];
 }
 
-#endif
+#endif /* _ASM_SW64_CHECKSUM_H */

arch/sw_64/include/asm/chip3_io.h

@@ -314,4 +314,4 @@ enum {
 	GPIO_SWPORTA_DDR =	GPIO_BASE | 0x200UL,
 };
 /*--------------------------------------------------------------------------*/
-#endif
+#endif /* _ASM_SW64_CHIP3_IO_H */

arch/sw_64/include/asm/cmpxchg.h

@@ -39,6 +39,7 @@
 #endif
 #undef ____xchg
 #undef ____cmpxchg
+#undef _ASM_SW64_XCHG_H
 #define ____xchg(type, args...)		__xchg ##type(args)
 #define ____cmpxchg(type, args...)	__cmpxchg ##type(args)
 #include <asm/xchg.h>

arch/sw_64/include/asm/core.h

@@ -45,4 +45,4 @@ extern void entSys(void);
 extern void entUna(void);
 /* head.S */
 extern void __smp_callin(unsigned long);
-#endif
+#endif /* _ASM_SW64_CORE_H */

arch/sw_64/include/asm/delay.h

@@ -8,4 +8,4 @@ extern void udelay(unsigned long usecs);
 extern void ndelay(unsigned long nsecs);
 #define ndelay ndelay
 
-#endif /* defined(_ASM_SW64_DELAY_H) */
+#endif /* _ASM_SW64_DELAY_H */

arch/sw_64/include/asm/device.h

@@ -10,4 +10,4 @@ struct dev_archdata {
 
 struct pdev_archdata {
 };
-#endif
+#endif /* _ASM_SW64_DEVICE_H */

arch/sw_64/include/asm/dmi.h

@@ -27,4 +27,4 @@
 #define dmi_unmap(x)			early_iounmap(x, 0)
 #define dmi_alloc(l)			kzalloc(l, GFP_KERNEL)
 
-#endif
+#endif /* _ASM_SW64_DMI_H */

arch/sw_64/include/asm/early_ioremap.h

@@ -27,4 +27,4 @@ static inline void early_iounmap(volatile void __iomem *addr, unsigned long size
 }
 #define early_memunmap(addr, size)		early_iounmap(addr, size)
 
-#endif
+#endif /* _ASM_SW64_EARLY_IOREMAP_H */

arch/sw_64/include/asm/extable.h

@@ -56,4 +56,4 @@ struct exception_table_entry {
 extern short regoffsets[];
 #define map_regs(r) (*(unsigned long *)((char *)regs + regoffsets[r]))
 
-#endif
+#endif /* _ASM_SW64_EXTABLE_H */

arch/sw_64/include/asm/hmcall.h

 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_HMC_H
-#define _ASM_SW64_HMC_H
+#ifndef _ASM_SW64_HMCALL_H
+#define _ASM_SW64_HMCALL_H
 
 /*
  * Common HMC-code
@@ -216,4 +216,4 @@ __CALL_HMC_W1(wrtp, unsigned long);
 #endif /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */
 
-#endif /* _ASM_SW64_HMC_H */
+#endif /* _ASM_SW64_HMCALL_H */

arch/sw_64/include/asm/hw_init.h

@@ -162,4 +162,4 @@ DECLARE_STATIC_KEY_FALSE(run_mode_emul_key);
 	(((val) & CACHE_INDEX_BITS_MASK) >> CACHE_INDEX_BITS_SHIFT)
 #define current_cpu_data cpu_data[smp_processor_id()]
 
-#endif /* HW_INIT_H */
+#endif /* _ASM_SW64_HW_INIT_H */

arch/sw_64/include/asm/hw_irq.h

@@ -13,4 +13,4 @@ DECLARE_PER_CPU(unsigned long, irq_pmi_count);
 typedef unsigned int vector_irq_t[PERCPU_MSI_IRQS];
 DECLARE_PER_CPU(vector_irq_t, vector_irq);
 #endif
-#endif
+#endif /* _ASM_SW64_HW_IRQ_H */

arch/sw_64/include/asm/irq_impl.h

@@ -45,4 +45,4 @@ extern void handle_ipi(struct pt_regs *regs);
 extern void __init sw64_init_irq(void);
 extern irqreturn_t timer_interrupt(int irq, void *dev);
 
-#endif
+#endif /* _ASM_SW64_IRQ_IMPL_H */

arch/sw_64/include/asm/jump_label.h

 /* SPDX-License-Identifier: GPL-2.0 */
 
-#ifndef __ASM_SW64_JUMP_LABEL_H
-#define __ASM_SW64_JUMP_LABEL_H
+#ifndef _ASM_SW64_JUMP_LABEL_H
+#define _ASM_SW64_JUMP_LABEL_H
 
 #ifndef __ASSEMBLY__
 
@@ -47,4 +47,4 @@ struct jump_entry {
 };
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ASM_SW64_JUMP_LABEL_H */
+#endif /* _ASM_SW64_JUMP_LABEL_H */

arch/sw_64/include/asm/kvm_cma.h

 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_KVM_CMA_H__
-#define _ASM_SW64_KVM_CMA_H__
+#ifndef _ASM_SW64_KVM_CMA_H
+#define _ASM_SW64_KVM_CMA_H
 
 #include <linux/cma.h>
 
@@ -8,4 +8,4 @@ extern int __init kvm_cma_declare_contiguous(phys_addr_t base,
 			phys_addr_t size, phys_addr_t limit,
 			phys_addr_t alignment, unsigned int order_per_bit,
 			const char *name, struct cma **res_cma);
-#endif
+#endif /* _ASM_SW64_KVM_CMA_H */

arch/sw_64/include/asm/kvm_emulate.h

@@ -43,4 +43,4 @@ unsigned int interrupt_pending(struct kvm_vcpu *vcpu, bool *more);
 void clear_vcpu_irq(struct kvm_vcpu *vcpu);
 void inject_vcpu_irq(struct kvm_vcpu *vcpu, unsigned int irq);
 void try_deliver_interrupt(struct kvm_vcpu *vcpu, unsigned int irq, bool more);
-#endif
+#endif /* _ASM_SW64_KVM_EMULATE_H */

arch/sw_64/include/asm/kvm_para.h

@@ -23,4 +23,4 @@ static inline unsigned long kvm_hypercall3(unsigned long num,
 		: "$1", "$22", "$23", "$24", "$25");
 	return __r0;
 }
-#endif
+#endif /* _ASM_SW64_KVM_PARA_H */

arch/sw_64/include/asm/kvm_timer.h

@@ -6,4 +6,4 @@ void set_timer(struct kvm_vcpu *vcpu, unsigned long delta);
 void set_interrupt(struct kvm_vcpu *vcpu, unsigned int irq);
 enum hrtimer_restart clockdev_fn(struct hrtimer *timer);
 
-#endif
+#endif /* _ASM_SW64_KVM_TIMER_H */

arch/sw_64/include/asm/linkage.h

@@ -6,4 +6,4 @@
 #define SYSCALL_ALIAS(alias, name)                                      \
 	asm(#alias " = " #name "\n\t.globl " #alias)
 
-#endif
+#endif /* _ASM_SW64_LINKAGE_H */

arch/sw_64/include/asm/mmu.h

@@ -7,4 +7,4 @@ typedef struct {
 	unsigned long asid[NR_CPUS];
 	void *vdso;
 } mm_context_t;
-#endif
+#endif /* _ASM_SW64_MMU_H */

arch/sw_64/include/asm/ptrace.h

@@ -92,4 +92,4 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
 {
 	return regs->r0;
 }
-#endif
+#endif /* _ASM_SW64_PTRACE_H */

arch/sw_64/include/asm/setup.h

@@ -43,4 +43,4 @@
 extern struct boot_params *sunway_boot_params;
 #endif
 
-#endif
+#endif /* _ASM_SW64_SETUP_H */

arch/sw_64/include/asm/sfp-machine.h

@@ -66,4 +66,4 @@ do {								\
 /* We write the results always */
 #define FP_INHIBIT_RESULTS 0
 
-#endif
+#endif /* _ASM_SW64_SFP_MACHINE_H */

arch/sw_64/include/asm/signal.h

@@ -21,4 +21,4 @@ struct odd_sigaction {
 };
 
 #include <asm/sigcontext.h>
-#endif
+#endif /* _ASM_SW64_SIGNAL_H */

arch/sw_64/include/asm/smp.h

@@ -178,4 +178,4 @@ static inline void send_ipi(int cpu, unsigned long type)
 
 #define reset_cpu(cpu)  send_ipi((cpu), II_RESET)
 
-#endif
+#endif /* _ASM_SW64_SMP_H */

arch/sw_64/include/asm/spinlock_types.h

@@ -5,4 +5,4 @@
 #include <asm-generic/qspinlock_types.h>
 #include <asm-generic/qrwlock_types.h>
 
-#endif
+#endif /* _ASM_SW64_SPINLOCK_TYPES_H */

arch/sw_64/include/asm/suspend.h

 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_SLEEP_H
-#define _ASM_SW64_SLEEP_H
+#ifndef _ASM_SW64_SUSPEND_H
+#define _ASM_SW64_SUSPEND_H
 
 #include <asm/hmcall.h>
 #include <asm/ptrace.h>
@@ -45,4 +45,4 @@ struct processor_state {
 };
 
 extern void sw64_suspend_deep_sleep(struct processor_state *state);
-#endif /* _ASM_SW64_SLEEP_H */
+#endif /* _ASM_SW64_SUSPEND_H */

arch/sw_64/include/asm/sw64_init.h

 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_INIT_H
-#define _ASM_SW64_INIT_H
+#ifndef _ASM_SW64_SW64_INIT_H
+#define _ASM_SW64_SW64_INIT_H
 
 #include <linux/cpu.h>
 #include <linux/pci.h>
@@ -43,4 +43,4 @@ extern struct sw64_chip_init_ops *sw64_chip_init;
 
 DECLARE_PER_CPU(unsigned long, hard_node_id);
 
-#endif /* _ASM_SW64_INIT_H */
+#endif /* _ASM_SW64_SW64_INIT_H */

arch/sw_64/include/asm/sw64io.h

@@ -95,4 +95,4 @@ sw64_io_write(unsigned long node, unsigned long reg, unsigned long data)
 	addr = __va(SW64_IO_BASE(node) | reg);
 	writeq(data, addr);
 }
-#endif
+#endif /* _ASM_SW64_SW64IO_H */

arch/sw_64/include/asm/tc.h

@@ -13,4 +13,4 @@ static inline unsigned long rdtc(void)
 extern void tc_sync_clear(void);
 extern void tc_sync_ready(void *ignored);
 extern void tc_sync_set(void);
-#endif
+#endif /* _ASM_SW64_TC_H */

arch/sw_64/include/asm/timex.h

@@ -21,4 +21,4 @@ static inline cycles_t get_cycles(void)
 	return rdtc();
 }
 
-#endif
+#endif /* _ASM_SW64_TIMEX_H */

arch/sw_64/include/asm/tlb.h

@@ -15,4 +15,4 @@
 
 #define __pud_free_tlb(tlb, pud, address)	pud_free((tlb)->mm, pud)
 
-#endif
+#endif /* _ASM_SW64_TLB_H */

arch/sw_64/include/asm/wrperfmon.h

@@ -61,4 +61,4 @@
 #define MAX_HWEVENTS			2
 #define PMC_COUNT_MASK			((1UL << 58) - 1)
 
-#endif
+#endif /* _ASM_SW64_WRPERFMON_H */

arch/sw_64/include/asm/xchg.h

 /* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_SW64_XCHG_H
+#define _ASM_SW64_XCHG_H
+
 #ifndef _ASM_SW64_CMPXCHG_H
-#error Do not include xchg.h directly!
-#else
+#error Do not include xchg.h directly. Use cmpxchg.h
+#endif
 /*
  * xchg/xchg_local and cmpxchg/cmpxchg_local share the same code
  * except that local version do not have the expensive memory barrier.
@@ -325,4 +328,4 @@ static __always_inline unsigned long ____cmpxchg(, volatile void *ptr,
 	return old;
 }
 
-#endif
+#endif /* _ASM_SW64_XCHG_H */

arch/sw_64/include/asm/xor.h

@@ -844,4 +844,4 @@ static struct xor_block_template xor_block_sw64_prefetch = {
  */
 #define XOR_SELECT_TEMPLATE(FASTEST)   (&xor_block_sw64_prefetch)
 
-#endif
+#endif /* _ASM_SW64_XOR_H */

arch/sw_64/include/uapi/asm/errno.h

@@ -125,4 +125,4 @@
 
 #define EHWPOISON	139	/* Memory page has hardware error */
 
-#endif
+#endif /* _UAPI_ASM_SW64_ERRNO_H */

arch/sw_64/include/uapi/asm/fcntl.h

@@ -55,4 +55,4 @@
 
 #include <asm-generic/fcntl.h>
 
-#endif
+#endif /* _UAPI_ASM_SW64_FCNTL_H */

arch/sw_64/include/uapi/asm/hmcall.h

@@ -14,4 +14,4 @@
 #define HMC_gentrap		0xAA
 #define HMC_wrperfmon		0xB0
 
-#endif
+#endif /* _UAPI_ASM_SW64_HMCALL_H */

arch/sw_64/include/uapi/asm/perf_regs.h

 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
-#ifndef _ASM_SW64_PERF_REGS_H
-#define _ASM_SW64_PERF_REGS_H
+#ifndef _UAPI_ASM_SW64_PERF_REGS_H
+#define _UAPI_ASM_SW64_PERF_REGS_H
 
 enum perf_event_sw64_regs {
 	PERF_REG_SW64_R0,
@@ -42,4 +42,4 @@ enum perf_event_sw64_regs {
 	PERF_REG_SW64_R18,
 	PERF_REG_SW64_MAX,
 };
-#endif /* _ASM_SW64_PERF_REGS_H */
+#endif /* _UAPI_ASM_SW64_PERF_REGS_H */

arch/sw_64/include/uapi/asm/setup.h

@@ -4,4 +4,4 @@
 
 #define COMMAND_LINE_SIZE   2048
 
-#endif
+#endif /* _UAPI_ASM_SW64_SETUP_H */

arch/sw_64/include/uapi/asm/sigcontext.h

@@ -31,4 +31,4 @@ struct sigcontext {
 };
 
 
-#endif
+#endif /* _UAPI_ASM_SW64_SIGCONTEXT_H */

arch/sw_64/include/uapi/asm/siginfo.h

@@ -8,4 +8,4 @@
 #include <asm-generic/siginfo.h>
 
 
-#endif
+#endif /* _UAPI_ASM_SW64_SIGINFO_H */

arch/sw_64/include/uapi/asm/stat.h

@@ -48,4 +48,4 @@ struct stat64 {
 	long		__unused[3];
 };
 
-#endif
+#endif /* _UAPI_ASM_SW64_STAT_H */

arch/sw_64/kernel/pci_impl.h

@@ -25,4 +25,4 @@ extern const struct dma_map_ops sw64_dma_direct_ops;
 
 extern struct cma *sw64_kvm_cma;
 extern struct gen_pool *sw64_kvm_pool;
-#endif
+#endif /* _SW64_KERNEL_PCI_IMPL_H */

arch/sw_64/kernel/proto.h

@@ -19,4 +19,4 @@ extern void __init setup_sched_clock(void);
 extern void __init sw64_sched_clock_init(void);
 #endif
 
-#endif /* _SW64_PROTO_H */
+#endif /* _SW64_KERNEL_PROTO_H */

arch/sw_64/kvm/irq.h

@@ -3,10 +3,10 @@
  * irq.h: in kernel interrupt controller related definitions
  */
 
-#ifndef __IRQ_H
-#define __IRQ_H
+#ifndef _SW64_KVM_IRQ_H
+#define _SW64_KVM_IRQ_H
 static inline int irqchip_in_kernel(struct kvm *kvm)
 {
 	return 1;
 }
-#endif
+#endif /* _SW64_KVM_IRQ_H */

arch/sw_64/math-emu/sfp-util.h

 /* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _SW64_MATH_EMU_SFP_UTIL_H
+#define _SW64_MATH_EMU_SFP_UTIL_H
+
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
@@ -34,3 +37,5 @@ extern unsigned long __udiv_qrnnd(unsigned long *, unsigned long,
 #define __LITTLE_ENDIAN -1
 #endif
 #define __BYTE_ORDER __LITTLE_ENDIAN
+
+#endif /* _SW64_MATH_EMU_SFP_UTIL_H */

arch/sw_64/net/bpf_jit.h

@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SW64_BPF_JIT_H
-#define _SW64_BPF_JIT_H
+#ifndef _SW64_NET_BPF_JIT_H
+#define _SW64_NET_BPF_JIT_H
 
 /* SW64 instruction field shift */
 #define SW64_BPF_OPCODE_OFFSET		26
@@ -365,4 +365,4 @@ enum sw64_bpf_registers {
 	sw64_bpf_gen_format_simple_alu_imm(SW64_BPF_OPCODE_ALU_IMM, \
 			ra, imm8, dst, SW64_BPF_FUNC_ALU_CMPULE)
 
-#endif /* _SW64_BPF_JIT_H */
+#endif /* _SW64_NET_BPF_JIT_H */

arch/sw_64/oprofile/op_impl.h

@@ -53,4 +53,4 @@ struct op_axp_model {
 	unsigned char can_set_proc_mode;
 };
 
-#endif
+#endif /* _SW64_OPROFILE_OP_IMPL_H */

arch/sw_64/tools/relocs.h

 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef RELOCS_H
-#define RELOCS_H
+#ifndef _SW64_TOOLS_RELOCS_H
+#define _SW64_TOOLS_RELOCS_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -68,4 +68,4 @@ enum symtype {
 
 void process(FILE *fp, int as_text, int as_bin,
 		int show_reloc_info, int keep_relocs);
-#endif /* RELOCS_H */
+#endif /* _SW64_TOOLS_RELOCS_H */