diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 21:22:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 21:22:29 -0500 |
| commit | c00f08d705e149fbfaf7a252b4d4fbb7affdcc96 (patch) | |
| tree | 8c916856376d0d400ddda239d5be386f9b9516d7 /arch | |
| parent | c8b6de16d9434405e5832b8772e4f986ddd5118e (diff) | |
| parent | 3adbefee6fd58a061b2bf1df4f3769701860fc62 (diff) | |
Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
* 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
SLUB: fix checkpatch warnings
Use non atomic unlock
SLUB: Support for performance statistics
SLUB: Alternate fast paths using cmpxchg_local
SLUB: Use unique end pointer for each slab page.
SLUB: Deal with annoying gcc warning on kfree()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c95482b6b6dd..9d0acedf5f3f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -52,6 +52,10 @@ config HAVE_LATENCYTOP_SUPPORT | |||
| 52 | config SEMAPHORE_SLEEPERS | 52 | config SEMAPHORE_SLEEPERS |
| 53 | def_bool y | 53 | def_bool y |
| 54 | 54 | ||
| 55 | config FAST_CMPXCHG_LOCAL | ||
| 56 | bool | ||
| 57 | default y | ||
| 58 | |||
| 55 | config MMU | 59 | config MMU |
| 56 | def_bool y | 60 | def_bool y |
| 57 | 61 | ||