diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:24:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:24:33 -0700 |
| commit | 5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c (patch) | |
| tree | f9fbf8ba1b35ef2741b95b8a42d2eec9871e41cf /arch/sparc/include/asm/spitfire.h | |
| parent | 8e8e500fcadaf2e39f4f119ae60c289456527727 (diff) | |
| parent | f4142cba4e4065a416e78ade905bea29ff3930e6 (diff) | |
Merge git://github.com/davem330/sparc
* git://github.com/davem330/sparc:
sparc64: Force the execute bit in OpenFirmware's translation entries.
sparc: Make '-p' boot option meaningful again.
sparc, exec: remove redundant addr_limit assignment
sparc64: Future proof Niagara cpu detection.
Diffstat (limited to 'arch/sparc/include/asm/spitfire.h')
| -rw-r--r-- | arch/sparc/include/asm/spitfire.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h index 55a17c6efeb..d06a2660175 100644 --- a/arch/sparc/include/asm/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h @@ -43,6 +43,8 @@ #define SUN4V_CHIP_NIAGARA1 0x01 #define SUN4V_CHIP_NIAGARA2 0x02 #define SUN4V_CHIP_NIAGARA3 0x03 +#define SUN4V_CHIP_NIAGARA4 0x04 +#define SUN4V_CHIP_NIAGARA5 0x05 #define SUN4V_CHIP_UNKNOWN 0xff #ifndef __ASSEMBLY__ |