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

Commit b3e87bdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

Pull percpu fix from Tejun Heo:
 "One patch to fix a typo in percpu section name.  Given how long the
  bug has been there and that there hasn't been any report of brekage,
  it's unlikely to cause actual issues"

* 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  core: fix typo in percpu read_mostly section
parents 8de74717 330d2822

include/asm-generic/vmlinux.lds.h

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ 
	. = ALIGN(PAGE_SIZE);						\

	*(.data..percpu..page_aligned)					\

	. = ALIGN(cacheline);						\

	*(.data..percpu..readmostly)					\

	*(.data..percpu..read_mostly)					\

	. = ALIGN(cacheline);						\

	*(.data..percpu)						\

	*(.data..percpu..shared_aligned)				\

include/linux/percpu-defs.h

+2 −2
Original line number Diff line number Diff line
@@ -146,10 +146,10 @@ 
 * Declaration/definition used for per-CPU variables that must be read mostly.

 */

#define DECLARE_PER_CPU_READ_MOSTLY(type, name)			\

	DECLARE_PER_CPU_SECTION(type, name, "..readmostly")

	DECLARE_PER_CPU_SECTION(type, name, "..read_mostly")



#define DEFINE_PER_CPU_READ_MOSTLY(type, name)				\

	DEFINE_PER_CPU_SECTION(type, name, "..readmostly")

	DEFINE_PER_CPU_SECTION(type, name, "..read_mostly")



/*

 * Intermodule exports for per-CPU variables.  sparse forgets about