xen: delete new instances of added __cpuinit (3b284bde) · Commits · 戴 / test

commit ("xen: Support 64-bit PV guest receiving NMIs") and commit ( "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>

arch/x86/xen/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

drivers/xen/balloon.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -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,
		};

Admin message