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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Put the space for cpu0 per-cpu area into .data section
parents 99c3563e c459ce8b

arch/ia64/include/asm/sections.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
#include <asm-generic/sections.h>



extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[];

#ifdef	CONFIG_SMP

extern char __cpu0_per_cpu[];

#endif

extern char __start___vtop_patchlist[], __end___vtop_patchlist[];

extern char __start___rse_patchlist[], __end___rse_patchlist[];

extern char __start___mckinley_e9_bundles[], __end___mckinley_e9_bundles[];

arch/ia64/kernel/head.S

+5 −4
Original line number Diff line number Diff line
@@ -367,16 +367,17 @@ start_ap: 
	;;

#else

(isAP)	br.few 2f

	mov r20=r19

	sub r19=r19,r18

	movl r20=__cpu0_per_cpu

	;;

	shr.u r18=r18,3

1:

	ld8 r21=[r20],8;;

	st8[r19]=r21,8

	ld8 r21=[r19],8;;

	st8[r20]=r21,8

	adds r18=-1,r18;;

	cmp4.lt p7,p6=0,r18

(p7)	br.cond.dptk.few 1b

	mov r19=r20

	;;

2:

#endif

	tpa r19=r19

arch/ia64/kernel/vmlinux.lds.S

+5 −3
Original line number Diff line number Diff line
@@ -215,9 +215,6 @@ SECTIONS 
  /* Per-cpu data: */

  percpu : { } :percpu

  . = ALIGN(PERCPU_PAGE_SIZE);

#ifdef	CONFIG_SMP

  . = . + PERCPU_PAGE_SIZE;	/* cpu0 per-cpu space */

#endif

  __phys_per_cpu_start = .;

  .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET)

	{
@@ -233,6 +230,11 @@ SECTIONS 
  data : { } :data

  .data : AT(ADDR(.data) - LOAD_OFFSET)

	{

#ifdef	CONFIG_SMP

  . = ALIGN(PERCPU_PAGE_SIZE);

		__cpu0_per_cpu = .;

  . = . + PERCPU_PAGE_SIZE;	/* cpu0 per-cpu space */

#endif

		DATA_DATA

		*(.data1)

		*(.gnu.linkonce.d*)

arch/ia64/mm/contig.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ per_cpu_init (void) 
	 * get_zeroed_page().

	 */

	if (first_time) {

		void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE;

		void *cpu0_data = __cpu0_per_cpu;



		first_time=0;

arch/ia64/mm/discontig.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void *per_cpu_node_setup(void *cpu_data, int node) 


	for_each_possible_early_cpu(cpu) {

		if (cpu == 0) {

			void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE;

			void *cpu0_data = __cpu0_per_cpu;

			__per_cpu_offset[cpu] = (char*)cpu0_data -

				__per_cpu_start;

		} else if (node == node_cpuid[cpu].nid) {