From: Konrad Rzeszutek Wilk Date: Tue, 13 Dec 2011 16:27:08 +0000 (-0500) Subject: Merge branch 'stable/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad... X-Git-Tag: v2.6.39-400.9.0~830^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c1c344a8ba3c301fe799bfe82ac384e2a18b83e4;p=users%2Fjedix%2Flinux-maple.git Merge branch 'stable/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into uek2-merge Which adds the microcode code support. It is not upstream and probably won't be as the upstream as the x86 maintainers want to load the microcode blob (in a new format) as part of the GRUB loader: [http://lists.xen.org/archives/html/xen-devel/2011-12/msg00250.html] Jan Beulich implemented a patchset for Xen hypervisor which would do this as part of the mboot loader and define which payload using 'ucode='. [http://lists.xen.org/archives/html/xen-devel/2011-12/msg00007.html] but that is not what the x86 maintainers want to do (as he did not define a new format and just ingested the raw binary blob). There is also a feature: "[PATCH] x86/microcode: Allow "ucode=" argument to be negative" which will pick the microcode as the last payload. For the time being lets use this old driver that loads the microcode in the dom0 and pushes it up to the hypervisor - and let the x86 and xen folks sort this out. * 'stable/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: x86/microcode: check proper return code. xen/v86d: Fix /dev/mem to access memory below 1MB xen: add CPU microcode update driver xen: add dom0_op hypercall xen/acpi: Domain0 acpi parser related platform hypercall Conflicts: arch/x86/xen/Kconfig --- c1c344a8ba3c301fe799bfe82ac384e2a18b83e4 diff --cc arch/x86/xen/Kconfig index ec6ec9cf34fa,4d04d4f1acfb..b55683df8003 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@@ -51,3 -49,15 +51,8 @@@ config XEN_DEBUG_F help Enable statistics output and various tuning options in debugfs. Enabling this option may incur a significant performance overhead. + -config XEN_DEBUG - bool "Enable Xen debug checks" - depends on XEN - default n - help - Enable various WARN_ON checks in the Xen MMU code. - Enabling this option WILL incur a significant performance overhead. + + config MICROCODE_XEN + def_bool y - depends on XEN_DOM0 && MICROCODE ++ depends on XEN_DOM0 && MICROCODE