diff options
author | David S. Miller <davem@davemloft.net> | 2017-08-10 12:11:16 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-08-10 12:11:16 -0700 |
commit | 3b2b69efeca734b78bc85fd02253b0465bb2bec7 (patch) | |
tree | 57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47 /arch/sparc/include | |
parent | 2e2d5d767c9ddb2b10d74f2c20a257101c7070eb (diff) | |
parent | 26273939ace935dd7553b31d279eab30b40f7b9a (diff) | |
download | linux-stable-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.gz linux-stable-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.bz2 linux-stable-3b2b69efeca734b78bc85fd02253b0465bb2bec7.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.
Minor context conflict in bcmsysport statistics bug fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/spitfire.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h index 1d8321c827a8..1b1286d05069 100644 --- a/arch/sparc/include/asm/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h @@ -47,10 +47,26 @@ #define SUN4V_CHIP_NIAGARA5 0x05 #define SUN4V_CHIP_SPARC_M6 0x06 #define SUN4V_CHIP_SPARC_M7 0x07 +#define SUN4V_CHIP_SPARC_M8 0x08 #define SUN4V_CHIP_SPARC64X 0x8a #define SUN4V_CHIP_SPARC_SN 0x8b #define SUN4V_CHIP_UNKNOWN 0xff +/* + * The following CPU_ID_xxx constants are used + * to identify the CPU type in the setup phase + * (see head_64.S) + */ +#define CPU_ID_NIAGARA1 ('1') +#define CPU_ID_NIAGARA2 ('2') +#define CPU_ID_NIAGARA3 ('3') +#define CPU_ID_NIAGARA4 ('4') +#define CPU_ID_NIAGARA5 ('5') +#define CPU_ID_M6 ('6') +#define CPU_ID_M7 ('7') +#define CPU_ID_M8 ('8') +#define CPU_ID_SONOMA1 ('N') + #ifndef __ASSEMBLY__ enum ultra_tlb_layout { |