Messages in this thread | | | Date | Wed, 14 Mar 2012 11:10:57 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tile tree with Linus' tree |
| |
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in arch/Kconfig between commit 43570fd2f47b ("mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL") (and a couple after) from Linus' tree and commit ca3a3d347e23 ("ipc: provide generic compat versions of IPC syscalls") from the tile tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/Kconfig index 4f55c73,dfb1e07..0000000 --- a/arch/Kconfig +++ b/arch/Kconfig @@@ -185,18 -181,7 +185,21 @@@ config HAVE_RCU_TABLE_FRE config ARCH_HAVE_NMI_SAFE_CMPXCHG bool +config HAVE_ALIGNED_STRUCT_PAGE + bool + help + This makes sure that struct pages are double word aligned and that + e.g. the SLUB allocator can perform double word atomic operations + on a struct page for better performance. However selecting this + might increase the size of a struct page by a word. + +config HAVE_CMPXCHG_LOCAL + bool + +config HAVE_CMPXCHG_DOUBLE + bool + + config ARCH_WANT_OLD_COMPAT_IPC + bool + source "kernel/gcov/Kconfig" [unhandled content-type:application/pgp-signature] | |