Skip to content

Commit 6732b35

Browse files
committed
Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
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
2 parents 6f3f374 + dbf563e commit 6732b35

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

arch/x86/hyperv/hv_apic.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,15 @@ void __init hv_apic_init(void)
273273
pr_info("Hyper-V: Using enlightened APIC (%s mode)",
274274
x2apic_enabled() ? "x2apic" : "xapic");
275275
/*
276-
* With x2apic, architectural x2apic MSRs are equivalent to the
277-
* respective synthetic MSRs, so there's no need to override
278-
* the apic accessors. The only exception is
279-
* hv_apic_eoi_write, because it benefits from lazy EOI when
280-
* available, but it works for both xapic and x2apic modes.
276+
* When in x2apic mode, don't use the Hyper-V specific APIC
277+
* accessors since the field layout in the ICR register is
278+
* different in x2apic mode. Furthermore, the architectural
279+
* x2apic MSRs function just as well as the Hyper-V
280+
* synthetic APIC MSRs, so there's no benefit in having
281+
* separate Hyper-V accessors for x2apic mode. The only
282+
* exception is hv_apic_eoi_write, because it benefits from
283+
* lazy EOI when available, but the same accessor works for
284+
* both xapic and x2apic because the field layout is the same.
281285
*/
282286
apic_set_eoi_write(hv_apic_eoi_write);
283287
if (!x2apic_enabled()) {

drivers/hv/hv_balloon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ static void balloon_up(struct work_struct *dummy)
12751275

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

0 commit comments

Comments
 (0)