diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 14:53:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 14:53:42 -0400 |
| commit | 5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f (patch) | |
| tree | 799e309a7db032cb7abe9f0fa910c2989c3fdab5 /arch/um/include | |
| parent | 4d429480352c63db2228489f0db9fd381cdc3c9c (diff) | |
| parent | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (diff) | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Unify input section names
percpu: Avoid extra NOP in percpu_cmpxchg16b_double
percpu: Cast away printk format warning
percpu: Always align percpu output section to PAGE_SIZE
Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S index 34bede8aad4a..4938de5512d2 100644 --- a/arch/um/include/asm/common.lds.S +++ b/arch/um/include/asm/common.lds.S | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | INIT_SETUP(0) | 42 | INIT_SETUP(0) |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | PERCPU(32, 32) | 45 | PERCPU_SECTION(32) |
| 46 | 46 | ||
| 47 | .initcall.init : { | 47 | .initcall.init : { |
| 48 | INIT_CALLS | 48 | INIT_CALLS |