diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-18 01:26:14 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-18 01:26:14 +0300 |
commit | e29116758c4e06be9ba6358350f9d9f466414efb (patch) | |
tree | 6591c7a09afcf7857467b20a3999d582715230c9 /arch/sparc | |
parent | e71d5126e77c68b7ed1fad275fdc8825e9597448 (diff) | |
parent | 7b8b098c47bcf1986a6d7ecac9f44741fcae7d8c (diff) | |
download | linux-e29116758c4e06be9ba6358350f9d9f466414efb.tar.xz |
Merge branch 'parisc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Highlights:
- one important fix from Dave to prevent kernel crash when userspace
hands over invalid values to our in-kernel CAS implementation.
- added CPU topology support, including multi-core scheduler support
on PA8900 CPUs
Minor changes:
- minor fixes for sparse (from Luc)
- drop duplicates for CPU_BIG_ENDIAN from parisc and sparc top
Kconfig files (from Babu)
- reorganized parisc PDC (firmware-access) header files for usage
from userspace. Required for upcoming qemu parisc emulator and
SeaBIOS fork to support parisc"
* 'parisc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
arch: Fix duplicates in Kconfig for parisc and sparc
parisc: Make some PDC structures accessible in uapi headers
parisc: Pass endianness info to sparse
parisc: Add CPU topology support
parisc: Fix validity check of pointer size argument in new CAS implementation
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 4e83f950713e..987a57502909 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -96,9 +96,6 @@ config ARCH_PROC_KCORE_TEXT config CPU_BIG_ENDIAN def_bool y -config CPU_BIG_ENDIAN - def_bool y - config ARCH_ATU bool default y if SPARC64 |