diff options
| author | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
| commit | 068f7b64bf2054e20bbbd0782aa11f6ff8d17105 (patch) | |
| tree | f9f88dfe79f4be4789480dc22f74908b3484a8f8 /arch/arc/include/asm/cache.h | |
| parent | timekeeping: Remove the temporary CLOCK_AUX workaround (diff) | |
| parent | Linux 6.16-rc2 (diff) | |
| download | kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.tar.gz kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.zip | |
Merge v6.16-rc2 into timers/ptp
to pick up the __GENMASK() fix, otherwise the AUX clock VDSO patches fail
to compile for compat.
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'arch/arc/include/asm/cache.h')
| -rw-r--r-- | arch/arc/include/asm/cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index f0f1fc5d62b6..040a97f4dd82 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -23,7 +23,7 @@ */ #define ARC_UNCACHED_ADDR_SPACE 0xc0000000 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <linux/build_bug.h> @@ -65,7 +65,7 @@ extern int ioc_enable; extern unsigned long perip_base, perip_end; -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /* Instruction cache related Auxiliary registers */ #define ARC_REG_IC_BCR 0x77 /* Build Config reg */ |