Merge tag 'for-linus-5.5b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen fixes from Juergen Gross:
 "Two fixes: one for a resource accounting bug in some configurations
  and a fix for another patch which went into rc1"

* tag 'for-linus-5.5b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: fix ballooned page accounting without hotplug enabled
  xen-blkback: prevent premature module unload

diff --combined drivers/xen/balloon.c
index 4f2e78a5e4dbee31147978a228646b30e6ed8d28,bed90d612e484e004a0b287948dbb32e1daa6988..0c142bcab79d61d50e67a97862aecabe7c0542a2
--- 1/drivers/xen/balloon.c
--- 2/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@@ -374,6 -374,7 +374,6 @@@ static void xen_online_page(struct pag
        mutex_lock(&balloon_mutex);
        for (i = 0; i < size; i++) {
                p = pfn_to_page(start_pfn + i);
 -              __online_page_set_limits(p);
                balloon_append(p);
        }
        mutex_unlock(&balloon_mutex);
@@@ -394,7 -395,8 +394,8 @@@ static struct notifier_block xen_memory
  #else
  static enum bp_state reserve_additional_memory(void)
  {
-       balloon_stats.target_pages = balloon_stats.current_pages;
+       balloon_stats.target_pages = balloon_stats.current_pages +
+                                    balloon_stats.target_unpopulated;
        return BP_ECANCELED;
  }
  #endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */