Skip to content

Commit

Permalink
xen: delete new instances of added __cpuinit
Browse files Browse the repository at this point in the history
commit 6efa20e
("xen: Support 64-bit PV guest receiving NMIs") and
commit cd9151e
( "xen/balloon: set a mapping for ballooned out pages")
added new instances of __cpuinit usage.

We removed this a couple versions ago; we now want to remove
the compat no-op stubs.  Introducing new users is not what
we want to see at this point in time, as it will break once
the stubs are gone.

Cc: Konrad Rzeszutek Wilk <konrad@kernel.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Paul Gortmaker authored and Konrad Rzeszutek Wilk committed Nov 8, 2013
1 parent c275a57 commit 3b284bd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/x86/xen/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ void xen_enable_syscall(void)
}
#endif /* CONFIG_X86_64 */
}
void __cpuinit xen_enable_nmi(void)
void xen_enable_nmi(void)
{
#ifdef CONFIG_X86_64
if (register_callback(CALLBACKTYPE_nmi, nmi))
Expand Down
4 changes: 2 additions & 2 deletions drivers/xen/balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ static void __init balloon_add_region(unsigned long start_pfn,
}
}

static int __cpuinit balloon_cpu_notify(struct notifier_block *self,
static int balloon_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
int cpu = (long)hcpu;
Expand All @@ -616,7 +616,7 @@ static int __cpuinit balloon_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}

static struct notifier_block balloon_cpu_notifier __cpuinitdata = {
static struct notifier_block balloon_cpu_notifier = {
.notifier_call = balloon_cpu_notify,
};

Expand Down

0 comments on commit 3b284bd

Please sign in to comment.