diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 20:50:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 20:50:37 -0700 |
| commit | 997b611baf7591ea5119539ee821a3e2f4fcf24e (patch) | |
| tree | 9f2c78a343ddb90810f5dabc8e6cf07ee118eb19 /init/Kconfig | |
| parent | 2c34ff14bf1d03a705f5400888ecac5b6400e981 (diff) | |
| parent | 690d097c00c88fa9d93d198591e184164b1d8c20 (diff) | |
Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Changes include:
- Fix boot of 32bit SMP kernel (initial kernel mapping was too small)
- Added hardened usercopy checks
- Drop bootmem and switch to memblock and NO_BOOTMEM implementation
- Drop the BROKEN_RODATA config option (and thus remove the relevant
code from the generic headers and files because parisc was the last
architecture which used this config option)
- Improve segfault reporting by printing human readable error strings
- Various smaller changes, e.g. dwarf debug support for assembly
code, update comments regarding copy_user_page_asm, switch to
kmalloc_array()"
* 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Increase KERNEL_INITIAL_SIZE for 32-bit SMP kernels
parisc: Drop bootmem and switch to memblock
parisc: Add hardened usercopy feature
parisc: Add cfi_startproc and cfi_endproc to assembly code
parisc: Move hpmc stack into page aligned bss section
parisc: Fix self-detected CPU stall warnings on Mako machines
parisc: Report trap type as human readable string
parisc: Update comment regarding implementation of copy_user_page_asm
parisc: Use kmalloc_array() in add_system_map_addresses()
parisc: Check return value of smp_boot_one_cpu()
parisc: Drop BROKEN_RODATA config option
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3b9a47fe843b..d7fc22639665 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -2118,12 +2118,6 @@ config PADATA depends on SMP bool -# Can be selected by architectures with broken toolchains -# that get confused by correct const<->read_only section -# mappings -config BROKEN_RODATA - bool - config ASN1 tristate help |