diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 13:00:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 13:00:53 -0700 |
| commit | 40779859de0f73b40390c6401a024d06cf024290 (patch) | |
| tree | b799c66c3886a8be5c40c3c382f1a5feda7dabef /include | |
| parent | ffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97 (diff) | |
| parent | a947eb95ea03199da7408a64baa97fbb613e9b84 (diff) | |
| download | linux-3.10-40779859de0f73b40390c6401a024d06cf024290.tar.gz linux-3.10-40779859de0f73b40390c6401a024d06cf024290.tar.bz2 linux-3.10-40779859de0f73b40390c6401a024d06cf024290.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
SLAB: Record actual last user of freed objects.
slub: always align cpu_slab to honor cmpxchg_double requirement
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/percpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 8b97308e65d..9ca008f0c54 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -259,6 +259,9 @@ extern void __bad_size_call_parameter(void); * Special handling for cmpxchg_double. cmpxchg_double is passed two * percpu variables. The first has to be aligned to a double word * boundary and the second has to follow directly thereafter. + * We enforce this on all architectures even if they don't support + * a double cmpxchg instruction, since it's a cheap requirement, and it + * avoids breaking the requirement for architectures with the instruction. */ #define __pcpu_double_call_return_bool(stem, pcp1, pcp2, ...) \ ({ \ |