Merge branch 'fixes-2.6.39' into for-2.6.40
Tejun Heo [Tue, 24 May 2011 07:59:36 +0000 (09:59 +0200)]
1  2 
include/asm-generic/vmlinux.lds.h
mm/percpu.c

   * 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)                                 \
        }
  
  
diff --cc mm/percpu.c
Simple merge