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

1 files changed, 32 insertions, 29 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 077c00d94f6..db22d136ad0 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -15,7 +15,7 @@
  *      HEAD_TEXT_SECTION
  *      INIT_TEXT_SECTION(PAGE_SIZE)
  *      INIT_DATA_SECTION(...)
- *      PERCPU(CACHELINE_SIZE, PAGE_SIZE)
+ *      PERCPU_SECTION(CACHELINE_SIZE)
  *      __init_end = .;
  *
  *      _stext = .;
@@ -682,6 +682,28 @@
         }
 
 /**
+ * PERCPU_INPUT - the percpu input sections
+ * @cacheline: cacheline size
+ *
+ * The core percpu section names and core symbols which do not rely
+ * directly upon load addresses.
+ *
+ * @cacheline is used to align subsections to avoid false cacheline
+ * sharing between subsections for different purposes.
+ */
+#define PERCPU_INPUT(cacheline)                                         \
+        VMLINUX_SYMBOL(__per_cpu_start) = .;                            \
+        *(.data..percpu..first)                                         \
+        . = ALIGN(PAGE_SIZE);                                           \
+        *(.data..percpu..page_aligned)                                  \
+        . = ALIGN(cacheline);                                           \
+        *(.data..percpu..readmostly)                                    \
+        . = ALIGN(cacheline);                                           \
+        *(.data..percpu)                                                \
+        *(.data..percpu..shared_aligned)                                \
+        VMLINUX_SYMBOL(__per_cpu_end) = .;
+
+/**
  * PERCPU_VADDR - define output section for percpu area
  * @cacheline: cacheline size
  * @vaddr: explicit base address (optional)
@@ -703,52 +725,33 @@
  *
  * Note that this macros defines __per_cpu_load as an absolute symbol.
  * If there is no need to put the percpu section at a predetermined
- * address, use PERCPU().
+ * address, use PERCPU_SECTION.
  */
 #define PERCPU_VADDR(cacheline, vaddr, phdr)                            \
         VMLINUX_SYMBOL(__per_cpu_load) = .;                             \
         .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load)         \
                                 - LOAD_OFFSET) {                        \
-                VMLINUX_SYMBOL(__per_cpu_start) = .;                    \
-                *(.data..percpu..first)                                 \
-                . = ALIGN(PAGE_SIZE);                                   \
-                *(.data..percpu..page_aligned)                          \
-                . = ALIGN(cacheline);                                   \
-                *(.data..percpu..readmostly)                            \
-                . = ALIGN(cacheline);                                   \
-                *(.data..percpu)                                        \
-                *(.data..percpu..shared_aligned)                        \
-                VMLINUX_SYMBOL(__per_cpu_end) = .;                      \
+                PERCPU_INPUT(cacheline)                                 \
         } phdr                                                          \
         . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
 
 /**
- * PERCPU - define output section for percpu area, simple version
+ * PERCPU_SECTION - define output section for percpu area, simple version
  * @cacheline: cacheline size
- * @align: required alignment
  *
- * Align to @align and outputs output section for percpu area.  This macro
- * doesn't manipulate @vaddr or @phdr and __per_cpu_load and
+ * Align to PAGE_SIZE and outputs output section for percpu area.  This
+ * macro doesn't manipulate @vaddr or @phdr and __per_cpu_load and
  * __per_cpu_start will be identical.
  *
- * This macro is equivalent to ALIGN(@align); PERCPU_VADDR(@cacheline,,)
+ * This macro is equivalent to ALIGN(PAGE_SIZE); PERCPU_VADDR(@cacheline,,)
  * except that __per_cpu_load is defined as a relative symbol against
  * .data..percpu which is required for relocatable x86_32 configuration.
  */
-#define PERCPU(cacheline, align)                                        \
-        . = ALIGN(align);                                               \
+#define PERCPU_SECTION(cacheline)                                       \
+        . = ALIGN(PAGE_SIZE);                                           \
         .data..percpu   : AT(ADDR(.data..percpu) - LOAD_OFFSET) {       \
                 VMLINUX_SYMBOL(__per_cpu_load) = .;                     \
-                VMLINUX_SYMBOL(__per_cpu_start) = .;                    \
-                *(.data..percpu..first)                                 \
-                . = ALIGN(PAGE_SIZE);                                   \
-                *(.data..percpu..page_aligned)                          \
-                . = ALIGN(cacheline);                                   \
-                *(.data..percpu..readmostly)                            \
-                . = ALIGN(cacheline);                                   \
-                *(.data..percpu)                                        \
-                *(.data..percpu..shared_aligned)                        \
-                VMLINUX_SYMBOL(__per_cpu_end) = .;                      \
+                PERCPU_INPUT(cacheline)                                 \
         }