diff options
| author | Linus Torvalds | 2012-01-09 13:08:28 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2012-01-09 13:08:28 -0800 |
| commit | 6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5 (patch) | |
| tree | 33e64fc453619978c3ecc86c7ec3649db3b4d8dc /arch/x86/oprofile | |
| parent | db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3 (diff) | |
| parent | 933393f58fef9963eac61db8093689544e29a600 (diff) | |
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Remove irqsafe_cpu_xxx variants
Fix up conflict in arch/x86/include/asm/percpu.h due to clash with
cebef5beed3d ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()")
which edited the (now removed) irqsafe_cpu_cmpxchg*_double code.
Diffstat (limited to 'arch/x86/oprofile')
0 files changed, 0 insertions, 0 deletions