diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-26 04:22:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 04:22:20 +0100 |
| commit | 0093b108a6853d8398e1acf9021bcbd4666f4594 (patch) | |
| tree | ae286d9e1ae9ffacdd325ea76cd1d9ee88032efc /include/linux | |
| parent | alloc_percpu: fix UP build (diff) | |
| parent | percpu: fix too low alignment restriction on UP (diff) | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/percpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index d8e5a9abbce0..545b068bcb70 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -156,7 +156,7 @@ static inline void *__alloc_percpu(size_t size, size_t align) * on it. Larger alignment should only be used for module * percpu sections on SMP for which this path isn't used. */ - WARN_ON_ONCE(align > __alignof__(unsigned long long)); + WARN_ON_ONCE(align > SMP_CACHE_BYTES); return kzalloc(size, GFP_KERNEL); } |