Commit 056e6d89 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Tony Luck
Browse files

[IA64] fix a few section mismatch warnings 



Fix the following section mismatch warnings:

WARNING: vmlinux.o(.text+0x41902): Section mismatch: reference to .init.text:__alloc_bootmem (between 'ia64_mca_cpu_init' and 'ia64_do_tlb_purge')
WARNING: vmlinux.o(.text+0x49222): Section mismatch: reference to .init.text:__alloc_bootmem (between 'register_intr' and 'iosapic_register_intr')
WARNING: vmlinux.o(.text+0x62beb2): Section mismatch: reference to .init.text:__alloc_bootmem_node (between 'hubdev_init_node' and 'cnodeid_get_geoid')

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 80ba80a9

arch/ia64/kernel/iosapic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -560,7 +560,7 @@ iosapic_reassign_vector (int irq) 
	}

	}

}

}





static struct iosapic_rte_info *iosapic_alloc_rte (void)

static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void)

{

{

	int i;

	int i;

	struct iosapic_rte_info *rte;

	struct iosapic_rte_info *rte;

arch/ia64/kernel/mca.c

+11 −6
Original line number Original line Diff line number Diff line
@@ -1750,8 +1750,17 @@ format_mca_init_stack(void *mca_data, unsigned long offset, 
	strncpy(p->comm, type, sizeof(p->comm)-1);

	strncpy(p->comm, type, sizeof(p->comm)-1);

}

}





/* Do per-CPU MCA-related initialization.  */

/* Caller prevents this from being called after init */

static void * __init_refok mca_bootmem(void)

{

	void *p;





	p = alloc_bootmem(sizeof(struct ia64_mca_cpu) * NR_CPUS +

	                  KERNEL_STACK_SIZE);

	return (void *)ALIGN((unsigned long)p, KERNEL_STACK_SIZE);

}



/* Do per-CPU MCA-related initialization.  */

void __cpuinit

void __cpuinit

ia64_mca_cpu_init(void *cpu_data)

ia64_mca_cpu_init(void *cpu_data)

{

{
@@ -1763,11 +1772,7 @@ ia64_mca_cpu_init(void *cpu_data) 
		int cpu;

		int cpu;





		first_time = 0;

		first_time = 0;

		mca_data = alloc_bootmem(sizeof(struct ia64_mca_cpu)

		mca_data = mca_bootmem();

					 * NR_CPUS + KERNEL_STACK_SIZE);

		mca_data = (void *)(((unsigned long)mca_data +

					KERNEL_STACK_SIZE - 1) &

				(-KERNEL_STACK_SIZE));

		for (cpu = 0; cpu < NR_CPUS; cpu++) {

		for (cpu = 0; cpu < NR_CPUS; cpu++) {

			format_mca_init_stack(mca_data,

			format_mca_init_stack(mca_data,

					offsetof(struct ia64_mca_cpu, mca_stack),

					offsetof(struct ia64_mca_cpu, mca_stack),

arch/ia64/sn/kernel/io_common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -391,7 +391,7 @@ void sn_bus_free_sysdata(void) 
 * hubdev_init_node() - Creates the HUB data structure and link them to it's

 * hubdev_init_node() - Creates the HUB data structure and link them to it's

 *			own NODE specific data area.

 *			own NODE specific data area.

 */

 */

void hubdev_init_node(nodepda_t * npda, cnodeid_t node)

void __init hubdev_init_node(nodepda_t * npda, cnodeid_t node)

{

{

	struct hubdev_info *hubdev_info;

	struct hubdev_info *hubdev_info;

	int size;

	int size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE