Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5129df03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4d429480 6988f20f

arch/alpha/kernel/vmlinux.lds.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ SECTIONS 
	__init_begin = ALIGN(PAGE_SIZE);

	__init_begin = ALIGN(PAGE_SIZE);

	INIT_TEXT_SECTION(PAGE_SIZE)

	INIT_TEXT_SECTION(PAGE_SIZE)

	INIT_DATA_SECTION(16)

	INIT_DATA_SECTION(16)

	PERCPU(L1_CACHE_BYTES, PAGE_SIZE)

	PERCPU_SECTION(L1_CACHE_BYTES)

	/* Align to THREAD_SIZE rather than PAGE_SIZE here so any padding page

	/* Align to THREAD_SIZE rather than PAGE_SIZE here so any padding page

	   needed for the THREAD_SIZE aligned init_task gets freed after init */

	   needed for the THREAD_SIZE aligned init_task gets freed after init */

	. = ALIGN(THREAD_SIZE);

	. = ALIGN(THREAD_SIZE);

arch/arm/kernel/vmlinux.lds.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ SECTIONS 
#endif

#endif

	}

	}





	PERCPU(32, PAGE_SIZE)

	PERCPU_SECTION(32)





#ifndef CONFIG_XIP_KERNEL

#ifndef CONFIG_XIP_KERNEL

	. = ALIGN(PAGE_SIZE);

	. = ALIGN(PAGE_SIZE);

arch/blackfin/kernel/vmlinux.lds.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ SECTIONS 




	. = ALIGN(16);

	. = ALIGN(16);

	INIT_DATA_SECTION(16)

	INIT_DATA_SECTION(16)

	PERCPU(32, PAGE_SIZE)

	PERCPU_SECTION(32)





	.exit.data :

	.exit.data :

	{

	{

arch/cris/kernel/vmlinux.lds.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ SECTIONS 
#endif

#endif

	__vmlinux_end = .;		/* Last address of the physical file. */

	__vmlinux_end = .;		/* Last address of the physical file. */

#ifdef CONFIG_ETRAX_ARCH_V32

#ifdef CONFIG_ETRAX_ARCH_V32

	PERCPU(32, PAGE_SIZE)

	PERCPU_SECTION(32)





	.init.ramfs : {

	.init.ramfs : {

		INIT_RAM_FS

		INIT_RAM_FS

arch/frv/kernel/vmlinux.lds.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ SECTIONS 
  _einittext = .;

  _einittext = .;





  INIT_DATA_SECTION(8)

  INIT_DATA_SECTION(8)

  PERCPU(L1_CACHE_BYTES, 4096)

  PERCPU_SECTION(L1_CACHE_BYTES)





  . = ALIGN(PAGE_SIZE);

  . = ALIGN(PAGE_SIZE);

  __init_end = .;

  __init_end = .;