From: Ralf Baechle Date: Mon, 13 Apr 2015 14:03:32 +0000 (+0200) Subject: Merge branch '4.0-fixes' into mips-for-linux-next X-Git-Tag: Ubuntu-5.13.0-19.19~18123^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3e20a26b02bd4f24945c87407df51948dd488620;p=mirror_ubuntu-jammy-kernel.git Merge branch '4.0-fixes' into mips-for-linux-next --- 3e20a26b02bd4f24945c87407df51948dd488620 diff --cc arch/mips/include/asm/cpu.h index fd2e893e9d9f,e492c740bb94..e3adca1d0b99 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h @@@ -377,7 -377,7 +377,8 @@@ enum cpu_type_enum #define MIPS_CPU_MAAR 0x400000000ull /* MAAR(I) registers are present */ #define MIPS_CPU_FRE 0x800000000ull /* FRE & UFE bits implemented */ #define MIPS_CPU_RW_LLB 0x1000000000ull /* LLADDR/LLB writes are allowed */ - #define MIPS_CPU_CDMM 0x2000000000ull /* CPU has Common Device Memory Map */ + #define MIPS_CPU_XPA 0x2000000000ull /* CPU supports Extended Physical Addressing */ ++#define MIPS_CPU_CDMM 0x4000000000ull /* CPU has Common Device Memory Map */ /* * CPU ASE encodings