Commit ad3062a0 authored by Daniel Kiper's avatar Daniel Kiper Committed by Konrad Rzeszutek Wilk
Browse files

arch/x86/xen/enlighten: Cleanup code/data sections definitions 



Cleanup code/data sections definitions
accordingly to include/linux/init.h.

Signed-off-by: default avatarDaniel Kiper <dkiper@net-space.pl>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 251511a1

arch/x86/xen/enlighten.c

+10 −10
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, 
	*dx &= maskedx;

}



static __init void xen_init_cpuid_mask(void)

static void __init xen_init_cpuid_mask(void)

{

	unsigned int ax, bx, cx, dx;

	unsigned int xsave_mask;
@@ -400,7 +400,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr) 
/*

 * load_gdt for early boot, when the gdt is only mapped once

 */

static __init void xen_load_gdt_boot(const struct desc_ptr *dtr)

static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)

{

	unsigned long va = dtr->address;

	unsigned int size = dtr->size + 1;
@@ -662,7 +662,7 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry, 
 * Version of write_gdt_entry for use at early boot-time needed to

 * update an entry as simply as possible.

 */

static __init void xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,

static void __init xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,

					    const void *desc, int type)

{

	switch (type) {
@@ -933,18 +933,18 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, 
	return ret;

}



static const struct pv_info xen_info __initdata = {

static const struct pv_info xen_info __initconst = {

	.paravirt_enabled = 1,

	.shared_kernel_pmd = 0,



	.name = "Xen",

};



static const struct pv_init_ops xen_init_ops __initdata = {

static const struct pv_init_ops xen_init_ops __initconst = {

	.patch = xen_patch,

};



static const struct pv_cpu_ops xen_cpu_ops __initdata = {

static const struct pv_cpu_ops xen_cpu_ops __initconst = {

	.cpuid = xen_cpuid,



	.set_debugreg = xen_set_debugreg,
@@ -1004,7 +1004,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { 
	.end_context_switch = xen_end_context_switch,

};



static const struct pv_apic_ops xen_apic_ops __initdata = {

static const struct pv_apic_ops xen_apic_ops __initconst = {

#ifdef CONFIG_X86_LOCAL_APIC

	.startup_ipi_hook = paravirt_nop,

#endif
@@ -1055,7 +1055,7 @@ int xen_panic_handler_init(void) 
	return 0;

}



static const struct machine_ops __initdata xen_machine_ops = {

static const struct machine_ops xen_machine_ops __initconst = {

	.restart = xen_restart,

	.halt = xen_machine_halt,

	.power_off = xen_machine_halt,
@@ -1332,7 +1332,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata xen_hvm_cpu_notifier = {

static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = {

	.notifier_call	= xen_hvm_cpu_notify,

};
@@ -1381,7 +1381,7 @@ bool xen_hvm_need_lapic(void) 
}

EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);



const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = {

const struct hypervisor_x86 x86_hyper_xen_hvm __refconst = {

	.name			= "Xen HVM",

	.detect			= xen_hvm_platform,

	.init_platform		= xen_hvm_guest_init,