22 files changed, 76 insertions, 143 deletions

diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 0038dc4c06c7..e5fb7525a5df 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -176,17 +176,14 @@ static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr,
                                const char * const list[])
 {
         unsigned char model_num[ATA_ID_PROD_LEN + 1];
-        int i = 0;
+        int i;
 
         ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
-        while (list[i] != NULL) {
-                if (!strcmp(list[i], model_num)) {
-                        pr_warn("%s is not supported for %s\n",
-                                modestr, list[i]);
-                        return 1;
-                }
-                i++;
+        i = match_string(list, -1, model_num);
+        if (i >= 0) {
+                pr_warn("%s is not supported for %s\n", modestr, list[i]);
+                return 1;
         }
         return 0;
 }
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 76628a7b45f1..9b1a65debd49 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -651,7 +651,7 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
         const char *propname, const char *string)
 {
         const char **values;
-        int nval, ret, i;
+        int nval, ret;
 
         nval = fwnode_property_read_string_array(fwnode, propname, NULL, 0);
         if (nval < 0)
@@ -668,13 +668,9 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
         if (ret < 0)
                 goto out;
 
-        ret = -ENODATA;
-        for (i = 0; i < nval; i++) {
-                if (!strcmp(values[i], string)) {
-                        ret = i;
-                        break;
-                }
-        }
+        ret = match_string(values, nval, string);
+        if (ret < 0)
+                ret = -ENODATA;
 out:
         kfree(values);
         return ret;
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index d048d2009e89..437b3a822f44 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -875,7 +875,7 @@ bio_pageinc(struct bio *bio)
                  * compound pages is no longer allowed by the kernel.
                  */
                 page = compound_head(bv.bv_page);
-                atomic_inc(&page->_count);
+                page_ref_inc(page);
         }
 }
 
@@ -888,7 +888,7 @@ bio_pagedec(struct bio *bio)
 
         bio_for_each_segment(bv, bio, iter) {
                 page = compound_head(bv.bv_page);
-                atomic_dec(&page->_count);
+                page_ref_dec(page);
         }
 }
 
diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
index 0c2f0a61b0ea..0b631e5b5b84 100644
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c
+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
@@ -94,15 +94,14 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
 
 found:
         __ioread32_copy(nvram_buf, header, sizeof(*header) / 4);
-        header = (struct nvram_header *)nvram_buf;
-        nvram_len = header->len;
+        nvram_len = ((struct nvram_header *)(nvram_buf))->len;
         if (nvram_len > size) {
                 pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
                 nvram_len = size;
         }
         if (nvram_len >= NVRAM_SPACE) {
                 pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-                       header->len, NVRAM_SPACE - 1);
+                       nvram_len, NVRAM_SPACE - 1);
                 nvram_len = NVRAM_SPACE - 1;
         }
         /* proceed reading data after header */
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 698b8c3b09d9..9a401aed98e0 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -170,16 +170,11 @@ static void *edid_load(struct drm_connector *connector, const char *name,
         int i, valid_extensions = 0;
         bool print_bad_edid = !connector->bad_edid_counter || (drm_debug & DRM_UT_KMS);
 
-        builtin = 0;
-        for (i = 0; i < GENERIC_EDIDS; i++) {
-                if (strcmp(name, generic_edid_name[i]) == 0) {
-                        fwdata = generic_edid[i];
-                        fwsize = sizeof(generic_edid[i]);
-                        builtin = 1;
-                        break;
-                }
-        }
-        if (!builtin) {
+        builtin = match_string(generic_edid_name, GENERIC_EDIDS, name);
+        if (builtin >= 0) {
+                fwdata = generic_edid[builtin];
+                fwsize = sizeof(generic_edid[builtin]);
+        } else {
                 struct platform_device *pdev;
                 int err;
 
@@ -252,7 +247,7 @@ static void *edid_load(struct drm_connector *connector, const char *name,
         }
 
         DRM_INFO("Got %s EDID base block and %d extension%s from "
-            "\"%s\" for connector \"%s\"\n", builtin ? "built-in" :
+            "\"%s\" for connector \"%s\"\n", (builtin >= 0) ? "built-in" :
             "external", valid_extensions, valid_extensions == 1 ? "" : "s",
             name, connector_name);
 
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 696b6c1ec940..f94baadbf424 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -531,14 +531,9 @@ static const struct hpt_info hpt371n = {
         .timings        = &hpt37x_timings
 };
 
-static int check_in_drive_list(ide_drive_t *drive, const char **list)
+static bool check_in_drive_list(ide_drive_t *drive, const char **list)
 {
-        char *m = (char *)&drive->id[ATA_ID_PROD];
-
-        while (*list)
-                if (!strcmp(*list++, m))
-                        return 1;
-        return 0;
+        return match_string(list, -1, (char *)&drive->id[ATA_ID_PROD]) >= 0;
 }
 
 static struct hpt_info *hpt3xx_get_info(struct device *dev)
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index b9ecf197ad11..f21b2c479780 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2944,7 +2944,7 @@ static bool gfar_add_rx_frag(struct gfar_rx_buff *rxb, u32 lstatus,
         /* change offset to the other half */
         rxb->page_offset ^= GFAR_RXB_TRUESIZE;
 
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index b243c3cbe68f..b4547ebed774 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -243,7 +243,7 @@ static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 31e5f3942839..5b4ad1ad4d5f 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6630,7 +6630,7 @@ static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c4003a88bbf6..e6035ff6b861 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1942,7 +1942,7 @@ static bool ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 3558f019b631..0ea14c0a2e74 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -837,7 +837,7 @@ add_tail_frag:
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 41440b2b20a3..86bcfe510e4e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -82,8 +82,7 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv,
         /* Not doing get_page() for each frag is a big win
          * on asymetric workloads. Note we can not use atomic_set().
          */
-        atomic_add(page_alloc->page_size / frag_info->frag_stride - 1,
-                   &page->_count);
+        page_ref_add(page, page_alloc->page_size / frag_info->frag_stride - 1);
         return 0;
 }
 
@@ -127,7 +126,7 @@ out:
                         dma_unmap_page(priv->ddev, page_alloc[i].dma,
                                 page_alloc[i].page_size, PCI_DMA_FROMDEVICE);
                         page = page_alloc[i].page;
-                        atomic_set(&page->_count, 1);
+                        set_page_count(page, 1);
                         put_page(page);
                 }
         }
@@ -165,7 +164,7 @@ static int mlx4_en_init_allocator(struct mlx4_en_priv *priv,
 
                 en_dbg(DRV, priv, "  frag %d allocator: - size:%d frags:%d\n",
                        i, ring->page_alloc[i].page_size,
-                       atomic_read(&ring->page_alloc[i].page->_count));
+                       page_ref_count(ring->page_alloc[i].page));
         }
         return 0;
 
@@ -177,7 +176,7 @@ out:
                 dma_unmap_page(priv->ddev, page_alloc->dma,
                                page_alloc->page_size, PCI_DMA_FROMDEVICE);
                 page = page_alloc->page;
-                atomic_set(&page->_count, 1);
+                set_page_count(page, 1);
                 put_page(page);
                 page_alloc->page = NULL;
         }
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index ab6051a43134..9cc45649f477 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -3341,7 +3341,7 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp,
 
         niu_hash_page(rp, page, addr);
         if (rp->rbr_blocks_per_page > 1)
-                atomic_add(rp->rbr_blocks_per_page - 1, &page->_count);
+                page_ref_add(page, rp->rbr_blocks_per_page - 1);
 
         for (i = 0; i < rp->rbr_blocks_per_page; i++) {
                 __le32 *rbr = &rp->rbr[start_index + i];
diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c
index 0b9c580af988..2eff989c6d9f 100644
--- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
+++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
@@ -880,14 +880,12 @@ mwifiex_reset_write(struct file *file,
 {
         struct mwifiex_private *priv = file->private_data;
         struct mwifiex_adapter *adapter = priv->adapter;
-        char cmd;
         bool result;
+        int rc;
 
-        if (copy_from_user(&cmd, ubuf, sizeof(cmd)))
-                return -EFAULT;
-
-        if (strtobool(&cmd, &result))
-                return -EINVAL;
+        rc = kstrtobool_from_user(ubuf, count, &result);
+        if (rc)
+                return rc;
 
         if (!result)
                 return -EINVAL;
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 29984b36926a..c223a9ef1fe1 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -334,7 +334,6 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
         unsigned num_groups;
         int ret;
         const char *group;
-        int i;
 
         if (!pmxops) {
                 dev_err(pctldev->dev, "does not support mux function\n");
@@ -363,19 +362,13 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
                 return -EINVAL;
         }
         if (map->data.mux.group) {
-                bool found = false;
                 group = map->data.mux.group;
-                for (i = 0; i < num_groups; i++) {
-                        if (!strcmp(group, groups[i])) {
-                                found = true;
-                                break;
-                        }
-                }
-                if (!found) {
+                ret = match_string(groups, num_groups, group);
+                if (ret < 0) {
                         dev_err(pctldev->dev,
                                 "invalid group \"%s\" for function \"%s\"\n",
                                 group, map->data.mux.function);
-                        return -EINVAL;
+                        return ret;
                 }
         } else {
                 group = groups[0];
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index 8f8044e1acf3..bf2e5dd301e7 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -906,26 +906,21 @@ static int ab8500_btemp_get_property(struct power_supply *psy,
 static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data)
 {
         struct power_supply *psy;
-        struct power_supply *ext;
+        struct power_supply *ext = dev_get_drvdata(dev);
+        const char **supplicants = (const char **)ext->supplied_to;
         struct ab8500_btemp *di;
         union power_supply_propval ret;
-        int i, j;
-        bool psy_found = false;
+        int j;
 
         psy = (struct power_supply *)data;
-        ext = dev_get_drvdata(dev);
         di = power_supply_get_drvdata(psy);
 
         /*
          * For all psy where the name of your driver
          * appears in any supplied_to
          */
-        for (i = 0; i < ext->num_supplicants; i++) {
-                if (!strcmp(ext->supplied_to[i], psy->desc->name))
-                        psy_found = true;
-        }
-
-        if (!psy_found)
+        j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
+        if (j < 0)
                 return 0;
 
         /* Go through all properties for the psy */
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index e388171f4e58..30de5d42b26a 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -1929,11 +1929,11 @@ static int ab8540_charger_usb_pre_chg_enable(struct ux500_charger *charger,
 static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data)
 {
         struct power_supply *psy;
-        struct power_supply *ext;
+        struct power_supply *ext = dev_get_drvdata(dev);
+        const char **supplicants = (const char **)ext->supplied_to;
         struct ab8500_charger *di;
         union power_supply_propval ret;
-        int i, j;
-        bool psy_found = false;
+        int j;
         struct ux500_charger *usb_chg;
 
         usb_chg = (struct ux500_charger *)data;
@@ -1941,15 +1941,9 @@ static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data)
 
         di = to_ab8500_charger_usb_device_info(usb_chg);
 
-        ext = dev_get_drvdata(dev);
-
         /* For all psy where the driver name appears in any supplied_to */
-        for (i = 0; i < ext->num_supplicants; i++) {
-                if (!strcmp(ext->supplied_to[i], psy->desc->name))
-                        psy_found = true;
-        }
-
-        if (!psy_found)
+        j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
+        if (j < 0)
                 return 0;
 
         /* Go through all properties for the psy */
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 3830dade5d69..5a36cf88578a 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2168,26 +2168,21 @@ static int ab8500_fg_get_property(struct power_supply *psy,
 static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data)
 {
         struct power_supply *psy;
-        struct power_supply *ext;
+        struct power_supply *ext = dev_get_drvdata(dev);
+        const char **supplicants = (const char **)ext->supplied_to;
         struct ab8500_fg *di;
         union power_supply_propval ret;
-        int i, j;
-        bool psy_found = false;
+        int j;
 
         psy = (struct power_supply *)data;
-        ext = dev_get_drvdata(dev);
         di = power_supply_get_drvdata(psy);
 
         /*
          * For all psy where the name of your driver
          * appears in any supplied_to
          */
-        for (i = 0; i < ext->num_supplicants; i++) {
-                if (!strcmp(ext->supplied_to[i], psy->desc->name))
-                        psy_found = true;
-        }
-
-        if (!psy_found)
+        j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
+        if (j < 0)
                 return 0;
 
         /* Go through all properties for the psy */
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 541f702e0451..d9104b1ab7cf 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -975,22 +975,18 @@ static void handle_maxim_chg_curr(struct abx500_chargalg *di)
 static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data)
 {
         struct power_supply *psy;
-        struct power_supply *ext;
+        struct power_supply *ext = dev_get_drvdata(dev);
+        const char **supplicants = (const char **)ext->supplied_to;
         struct abx500_chargalg *di;
         union power_supply_propval ret;
-        int i, j;
-        bool psy_found = false;
+        int j;
         bool capacity_updated = false;
 
         psy = (struct power_supply *)data;
-        ext = dev_get_drvdata(dev);
         di = power_supply_get_drvdata(psy);
         /* For all psy where the driver name appears in any supplied_to */
-        for (i = 0; i < ext->num_supplicants; i++) {
-                if (!strcmp(ext->supplied_to[i], psy->desc->name))
-                        psy_found = true;
-        }
-        if (!psy_found)
+        j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
+        if (j < 0)
                 return 0;
 
         /*
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 1ea5d1aa268b..e664ca7c0afd 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -2020,27 +2020,6 @@ static void __exit charger_manager_cleanup(void)
 module_exit(charger_manager_cleanup);
 
 /**
- * find_power_supply - find the associated power_supply of charger
- * @cm: the Charger Manager representing the battery
- * @psy: pointer to instance of charger's power_supply
- */
-static bool find_power_supply(struct charger_manager *cm,
-                        struct power_supply *psy)
-{
-        int i;
-        bool found = false;
-
-        for (i = 0; cm->desc->psy_charger_stat[i]; i++) {
-                if (!strcmp(psy->desc->name, cm->desc->psy_charger_stat[i])) {
-                        found = true;
-                        break;
-                }
-        }
-
-        return found;
-}
-
-/**
  * cm_notify_event - charger driver notify Charger Manager of charger event
  * @psy: pointer to instance of charger's power_supply
  * @type: type of charger event
@@ -2057,9 +2036,11 @@ void cm_notify_event(struct power_supply *psy, enum cm_event_types type,
 
         mutex_lock(&cm_list_mtx);
         list_for_each_entry(cm, &cm_list, entry) {
-                found_power_supply = find_power_supply(cm, psy);
-                if (found_power_supply)
+                if (match_string(cm->desc->psy_charger_stat, -1,
+                                 psy->desc->name) >= 0) {
+                        found_power_supply = true;
                         break;
+                }
         }
         mutex_unlock(&cm_list_mtx);
 
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 49fbfe8b0f24..e3d01619d6b3 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -65,18 +65,15 @@ EXPORT_SYMBOL_GPL(usb_speed_string);
 enum usb_device_speed usb_get_maximum_speed(struct device *dev)
 {
         const char *maximum_speed;
-        int err;
-        int i;
+        int ret;
 
-        err = device_property_read_string(dev, "maximum-speed", &maximum_speed);
-        if (err < 0)
+        ret = device_property_read_string(dev, "maximum-speed", &maximum_speed);
+        if (ret < 0)
                 return USB_SPEED_UNKNOWN;
 
-        for (i = 0; i < ARRAY_SIZE(speed_names); i++)
-                if (strcmp(maximum_speed, speed_names[i]) == 0)
-                        return i;
+        ret = match_string(speed_names, ARRAY_SIZE(speed_names), maximum_speed);
 
-        return USB_SPEED_UNKNOWN;
+        return (ret < 0) ? USB_SPEED_UNKNOWN : ret;
 }
 EXPORT_SYMBOL_GPL(usb_get_maximum_speed);
 
@@ -110,13 +107,10 @@ static const char *const usb_dr_modes[] = {
 
 static enum usb_dr_mode usb_get_dr_mode_from_string(const char *str)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++)
-                if (!strcmp(usb_dr_modes[i], str))
-                        return i;
+        int ret;
 
-        return USB_DR_MODE_UNKNOWN;
+        ret = match_string(usb_dr_modes, ARRAY_SIZE(usb_dr_modes), str);
+        return (ret < 0) ? USB_DR_MODE_UNKNOWN : ret;
 }
 
 enum usb_dr_mode usb_get_dr_mode(struct device *dev)
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 0c3691f46575..f2b77dea8d3c 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -30,6 +30,7 @@
 #include <linux/balloon_compaction.h>
 #include <linux/oom.h>
 #include <linux/wait.h>
+#include <linux/mm.h>
 
 /*
  * Balloon device works in 4K page units.  So each page is pointed to by
@@ -229,10 +230,13 @@ static void update_balloon_stats(struct virtio_balloon *vb)
         unsigned long events[NR_VM_EVENT_ITEMS];
         struct sysinfo i;
         int idx = 0;
+        long available;
 
         all_vm_events(events);
         si_meminfo(&i);
 
+        available = si_mem_available();
+
         update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_IN,
                                 pages_to_bytes(events[PSWPIN]));
         update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_OUT,
@@ -243,6 +247,8 @@ static void update_balloon_stats(struct virtio_balloon *vb)
                                 pages_to_bytes(i.freeram));
         update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMTOT,
                                 pages_to_bytes(i.totalram));
+        update_stat(vb, idx++, VIRTIO_BALLOON_S_AVAIL,
+                                pages_to_bytes(available));
 }
 
 /*