diff options
author | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 12:24:00 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 17:20:05 -0500 |
commit | 60709c093ed39aadb0f09972ebbc96dc34eb372e (patch) | |
tree | 983681311986070971d3756d9f8e75868aa7bb9a /arch/powerpc/Kconfig | |
parent | 7323f0d2881bbd426ce6bc0a956ef9e739ffe767 (diff) | |
parent | 0839ffb83e44e5ff1843e932592525fc2bff23ff (diff) |
nfsd: merge stable fix into main nfsd branch
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a8ee573fe610..281f4f1fcd1f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -164,7 +164,6 @@ config PPC select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE select HAVE_ARCH_HARDENED_USERCOPY select HAVE_KERNEL_GZIP - select HAVE_CC_STACKPROTECTOR config GENERIC_CSUM def_bool CPU_LITTLE_ENDIAN @@ -484,6 +483,7 @@ config RELOCATABLE bool "Build a relocatable kernel" depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE)) select NONSTATIC_KERNEL + select MODULE_REL_CRCS if MODVERSIONS help This builds a kernel image that is capable of running at the location the kernel is loaded at. For ppc32, there is no any |