diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-05 11:32:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-05 11:32:03 -0800 |
| commit | 6732b3548573780cd8e0ca17d90f3f1add6c0af7 (patch) | |
| tree | cfa15d3e3f2d47a398c5e9d656b40c3a23cbc49a /drivers | |
| parent | 6f3f374ac05d05cfa63d04f4479ead7e3cb6d087 (diff) | |
| parent | dbf563eee0b8cc056744514d91c5ffc2fa6c0982 (diff) | |
| download | linux-6732b3548573780cd8e0ca17d90f3f1add6c0af7.tar.bz2 | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hv/hv_balloon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index b64d2efbefe7..eb56e09ae15f 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -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."); |