diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-11 11:35:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-11 19:27:48 -0700 |
| commit | 582a0baee57b3fd66222f6f922e6fcf4cadb7765 (patch) | |
| tree | e29383d045ae4097cb045c2611c82fc43d0dbcec /arch/sparc/include | |
| parent | 593fc6ea47882e5953f820ab24a8618f20f0a5c0 (diff) | |
sparc32: remove all uses of ARCH_SUN4C
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/cpu_type.h | 4 | ||||
| -rw-r--r-- | arch/sparc/include/asm/elf_32.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/sparc/include/asm/cpu_type.h b/arch/sparc/include/asm/cpu_type.h index 4ca184d95d82..73a44dda1b07 100644 --- a/arch/sparc/include/asm/cpu_type.h +++ b/arch/sparc/include/asm/cpu_type.h @@ -19,16 +19,12 @@ enum sparc_cpu { #ifdef CONFIG_SPARC32 extern enum sparc_cpu sparc_cpu_model; -#define ARCH_SUN4C (sparc_cpu_model==sun4c) - #define SUN4M_NCPUS 4 /* Architectural limit of sun4m. */ #else #define sparc_cpu_model sun4u -/* This cannot ever be a sun4c :) That's just history. */ -#define ARCH_SUN4C 0 #endif #endif /* __ASM_CPU_TYPE_H */ diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h index 4269ca6ad18a..b5beb114d229 100644 --- a/arch/sparc/include/asm/elf_32.h +++ b/arch/sparc/include/asm/elf_32.h @@ -118,11 +118,10 @@ typedef struct { instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -/* Sun4c has none of the capabilities, most sun4m's have them all. +/* Most sun4m's have them all. * XXX This is gross, set some global variable at boot time. -DaveM */ -#define ELF_HWCAP ((ARCH_SUN4C) ? 0 : \ - (HWCAP_SPARC_FLUSH | HWCAP_SPARC_STBAR | \ +#define ELF_HWCAP ((HWCAP_SPARC_FLUSH | HWCAP_SPARC_STBAR | \ HWCAP_SPARC_SWAP | \ ((srmmu_modtype != Cypress && \ srmmu_modtype != Cypress_vE && \ |