Commit 6732b354 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull hyperv fixes from Wei Liu:

 - clarify a comment (Michael Kelley)

 - change a pr_warn() to pr_info() (Olaf Hering)

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  x86/hyperv: Clarify comment on x2apic mode
  hv_balloon: disable warning when floor reached
parents 6f3f374a dbf563ee
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -273,11 +273,15 @@ void __init hv_apic_init(void)
		pr_info("Hyper-V: Using enlightened APIC (%s mode)",
			x2apic_enabled() ? "x2apic" : "xapic");
		/*
		 * With x2apic, architectural x2apic MSRs are equivalent to the
		 * respective synthetic MSRs, so there's no need to override
		 * the apic accessors.  The only exception is
		 * hv_apic_eoi_write, because it benefits from lazy EOI when
		 * available, but it works for both xapic and x2apic modes.
		 * When in x2apic mode, don't use the Hyper-V specific APIC
		 * accessors since the field layout in the ICR register is
		 * different in x2apic mode. Furthermore, the architectural
		 * x2apic MSRs function just as well as the Hyper-V
		 * synthetic APIC MSRs, so there's no benefit in having
		 * separate Hyper-V accessors for x2apic mode. The only
		 * exception is hv_apic_eoi_write, because it benefits from
		 * lazy EOI when available, but the same accessor works for
		 * both xapic and x2apic because the field layout is the same.
		 */
		apic_set_eoi_write(hv_apic_eoi_write);
		if (!x2apic_enabled()) {
+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ static void balloon_up(struct work_struct *dummy)

	/* Refuse to balloon below the floor. */
	if (avail_pages < num_pages || avail_pages - num_pages < floor) {
		pr_warn("Balloon request will be partially fulfilled. %s\n",
		pr_info("Balloon request will be partially fulfilled. %s\n",
			avail_pages < num_pages ? "Not enough memory." :
			"Balloon floor reached.");