Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110AbcDVJuv (ORCPT ); Fri, 22 Apr 2016 05:50:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37098 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752178AbcDVJut (ORCPT ); Fri, 22 Apr 2016 05:50:49 -0400 Date: Fri, 22 Apr 2016 02:49:29 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: brgerst@gmail.com, peterz@infradead.org, luto@amacapital.net, mingo@kernel.org, bp@alien8.de, hpa@zytor.com, mcgrof@kernel.org, torvalds@linux-foundation.org, dvlasenk@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, david.vrabel@citrix.com Reply-To: luto@amacapital.net, brgerst@gmail.com, peterz@infradead.org, hpa@zytor.com, mcgrof@kernel.org, bp@alien8.de, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, david.vrabel@citrix.com, torvalds@linux-foundation.org In-Reply-To: <1460592286-300-3-git-send-email-mcgrof@kernel.org> References: <1460592286-300-3-git-send-email-mcgrof@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/xen: Use X86_SUBARCH_XEN for PV guest boots Git-Commit-ID: ea1794812410e92c537c839bedeb2d2b2f87c80d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2295 Lines: 66 Commit-ID: ea1794812410e92c537c839bedeb2d2b2f87c80d Gitweb: http://git.kernel.org/tip/ea1794812410e92c537c839bedeb2d2b2f87c80d Author: Luis R. Rodriguez AuthorDate: Wed, 13 Apr 2016 17:04:32 -0700 Committer: Ingo Molnar CommitDate: Fri, 22 Apr 2016 10:28:59 +0200 x86/xen: Use X86_SUBARCH_XEN for PV guest boots The use of subarch should have no current effect on Xen PV guests, as such this should have no current functional effects. Signed-off-by: Luis R. Rodriguez Reviewed-by: David Vrabel Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: andrew.cooper3@citrix.com Cc: andriy.shevchenko@linux.intel.com Cc: bigeasy@linutronix.de Cc: boris.ostrovsky@oracle.com Cc: ffainelli@freebox.fr Cc: george.dunlap@citrix.com Cc: glin@suse.com Cc: jgross@suse.com Cc: jlee@suse.com Cc: josh@joshtriplett.org Cc: julien.grall@linaro.org Cc: konrad.wilk@oracle.com Cc: kozerkov@parallels.com Cc: lenb@kernel.org Cc: lguest@lists.ozlabs.org Cc: linux-acpi@vger.kernel.org Cc: lv.zheng@intel.com Cc: matt@codeblueprint.co.uk Cc: mbizon@freebox.fr Cc: rjw@rjwysocki.net Cc: robert.moore@intel.com Cc: rusty@rustcorp.com.au Cc: tiwai@suse.de Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-3-git-send-email-mcgrof@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 880862c..61f4d9f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1670,6 +1670,7 @@ asmlinkage __visible void __init xen_start_kernel(void) boot_params.hdr.ramdisk_image = initrd_start; boot_params.hdr.ramdisk_size = xen_start_info->mod_len; boot_params.hdr.cmd_line_ptr = __pa(xen_start_info->cmd_line); + boot_params.hdr.hardware_subarch = X86_SUBARCH_XEN; if (!xen_initial_domain()) { add_preferred_console("xenboot", 0, NULL);