Commit 9d6f40b8 authored by Tony Luck's avatar Tony Luck
Browse files

[IA64] fix section mismatch warnings 



In 741f98fe Sam added full
checking across the entire vmlinux image.  This flushed out
a dozen new section mismatch warnings.  Start the whack-a-mole
game again to stomp them out.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3b74d18e

arch/ia64/kernel/head.S

+3 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ swapper_pg_dir: 
halt_msg:

	stringz "Halting kernel\n"



	.text

	.section .text.head,"ax"



	.global start_ap
@@ -392,6 +392,8 @@ self: hint @pause 
	br.sptk.many self		// endless loop

END(_start)



	.text



GLOBAL_ENTRY(ia64_save_debug_regs)

	alloc r16=ar.pfs,1,0,0,0

	mov r20=ar.lc			// preserve ar.lc

arch/ia64/kernel/smpboot.c

+3 −3
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ struct create_idle { 
	int cpu;

};



void

void __cpuinit

do_fork_idle(struct work_struct *work)

{

	struct create_idle *c_idle =
@@ -497,7 +497,7 @@ do_fork_idle(struct work_struct *work) 
	complete(&c_idle->done);

}



static int __devinit

static int __cpuinit

do_boot_cpu (int sapicid, int cpu)

{

	int timeout;
@@ -808,7 +808,7 @@ set_cpu_sibling_map(int cpu) 
	}

}



int __devinit

int __cpuinit

__cpu_up (unsigned int cpu)

{

	int ret;

arch/ia64/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ SECTIONS 
	KPROBES_TEXT

	*(.gnu.linkonce.t*)

    }

  .text.head : AT(ADDR(.text.head) - LOAD_OFFSET)

	{ *(.text.head) }

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

	{ *(.text2) }

#ifdef CONFIG_SMP

include/asm-ia64/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ max_xtp (void) 
extern int __cpu_disable (void);

extern void __cpu_die (unsigned int cpu);

extern void cpu_die (void) __attribute__ ((noreturn));

extern int __cpu_up (unsigned int cpu);

extern void __init smp_build_cpu_map(void);



extern void __init init_smp_config (void);