diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:13:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:13:16 +1100 |
| commit | e15246babb490d1285a70591b5544d57c427c4d5 (patch) | |
| tree | 974cb736e8c5049ed96d6fce94619d63fced84a7 /arch | |
| parent | 37b9a1de57381e12e565bc5dda6be7528abbbb35 (diff) | |
| parent | 40b1f8f7b57f89ce2709a3d901a8f0bf3740fbcb (diff) | |
Merge remote-tracking branch 'rcu/rcu/next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/Kconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index b6e78dc56935..c2b1b5973b91 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -316,6 +316,9 @@ config HAVE_CMPXCHG_LOCAL config HAVE_CMPXCHG_DOUBLE bool +config ARCH_WEAK_RELEASE_ACQUIRE + bool + config ARCH_WANT_IPC_PARSE_VERSION bool diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 70fc7cd2ff67..a35ab50d2eba 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -166,6 +166,7 @@ config PPC select HAVE_ARCH_HARDENED_USERCOPY select HAVE_KERNEL_GZIP select HAVE_CONTEXT_TRACKING if PPC64 + select ARCH_WEAK_RELEASE_ACQUIRE config GENERIC_CSUM def_bool n |