Merge tag 'for-linus-5.4-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fixlet from Juergen Gross: "Just one patch for issuing a deprecation warning for 32-bit Xen pv guests" * tag 'for-linus-5.4-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: issue deprecation warning for 32-bit pv guest

Linus Torvalds committed 7 years ago

Commit 4fac2402 parents 964f9cf 6ccae601 file · +8 −0Browse files

Unified · Split

arch/x86/xen/enlighten_pv.c+8−0

@@ -117,6 +117,14 @@ static void __init xen_banner(void) · 116 unmodified lines
117	117	printk(KERN_INFO "Xen version: %d.%d%s%s\n",
118	118	version >> 16, version & 0xffff, extra.extraversion,
119	119	xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
	120	+
	121	+#ifdef CONFIG_X86_32
	122	+ pr_warn("WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING!\n"
	123	+ "Support for running as 32-bit PV-guest under Xen will soon be removed\n"
	124	+ "from the Linux kernel!\n"
	125	+ "Please use either a 64-bit kernel or switch to HVM or PVH mode!\n"
	126	+ "WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING!\n");
	127	+#endif
120	128	}
121	129
122	130	static void __init xen_pv_init_platform(void)