Merge branch 'x86/asm' into x86/atomic

Merge reason:
	Conflict between LOCK_PREFIX_HERE and relative alternatives
	pointers

Resolved Conflicts:
	arch/x86/include/asm/alternative.h
	arch/x86/kernel/alternative.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

9 files changed, 57 insertions, 40 deletions

diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 18d65fb42ee7..fb09bb3c0ad6 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
+#include <linux/gfp.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mc146818rtc.h>
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
index b3a0cf57442e..3a4460265b10 100644
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
@@ -36,6 +36,7 @@
  */
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/blkdev.h>
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index dbdf6fadfc79..a777a35381d2 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/dmi.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 
 struct dmi_device_attribute{
         struct device_attribute dev_attr;
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 31b983d9462c..d46467271349 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -5,7 +5,6 @@
 #include <linux/dmi.h>
 #include <linux/efi.h>
 #include <linux/bootmem.h>
-#include <linux/slab.h>
 #include <asm/dmi.h>
 
 /*
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 9e4f59dc7f1e..110e24e50883 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
         return ret;
 }
 
-static struct sysfs_ops edd_attr_ops = {
+static const struct sysfs_ops edd_attr_ops = {
         .show = edd_attr_show,
 };
 
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index f4f709d1370b..81b70bd07586 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -77,6 +77,7 @@
 #include <linux/sysfs.h>
 #include <linux/kobject.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
@@ -362,7 +363,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr,
         return ret;
 }
 
-static struct sysfs_ops efivar_attr_ops = {
+static const struct sysfs_ops efivar_attr_ops = {
         .show = efivar_attr_show,
         .store = efivar_attr_store,
 };
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 051d1ebbd287..ed2801c378de 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -380,8 +380,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
         struct ibft_nic *nic = entry->nic;
         void *ibft_loc = entry->header;
         char *str = buf;
-        char *mac;
-        int val;
+        __be32 val;
 
         if (!nic)
                 return 0;
@@ -397,10 +396,8 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
                 str += sprintf_ipaddr(str, nic->ip_addr);
                 break;
         case ibft_eth_subnet_mask:
-                val = ~((1 << (32-nic->subnet_mask_prefix))-1);
-                str += sprintf(str, NIPQUAD_FMT,
-                               (u8)(val >> 24), (u8)(val >> 16),
-                               (u8)(val >> 8), (u8)(val));
+                val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
+                str += sprintf(str, "%pI4", &val);
                 break;
         case ibft_eth_origin:
                 str += sprintf(str, "%d\n", nic->origin);
@@ -421,10 +418,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
                 str += sprintf(str, "%d\n", nic->vlan);
                 break;
         case ibft_eth_mac:
-                mac = nic->mac;
-                str += sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                               (u8)mac[0], (u8)mac[1], (u8)mac[2],
-                               (u8)mac[3], (u8)mac[4], (u8)mac[5]);
+                str += sprintf(str, "%pM\n", nic->mac);
                 break;
         case ibft_eth_hostname:
                 str += sprintf_string(str, nic->hostname_len,
@@ -525,7 +519,7 @@ static ssize_t ibft_show_attribute(struct kobject *kobj,
         return ret;
 }
 
-static struct sysfs_ops ibft_attr_ops = {
+static const struct sysfs_ops ibft_attr_ops = {
         .show = ibft_show_attribute,
 };
 
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index dfb15c06c88f..d6470ef36e4a 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -27,7 +27,6 @@
 #include <linux/limits.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/types.h>
@@ -52,7 +51,7 @@ EXPORT_SYMBOL_GPL(ibft_addr);
  * Routine used to find the iSCSI Boot Format Table. The logical
  * kernel address is set in the ibft_addr global variable.
  */
-void __init reserve_ibft_region(void)
+unsigned long __init find_ibft_region(unsigned long *sizep)
 {
         unsigned long pos;
         unsigned int len = 0;
@@ -78,6 +77,11 @@ void __init reserve_ibft_region(void)
                         }
                 }
         }
-        if (ibft_addr)
-                reserve_bootmem(pos, PAGE_ALIGN(len), BOOTMEM_DEFAULT);
+        if (ibft_addr) {
+                *sizep = PAGE_ALIGN(len);
+                return pos;
+        }
+
+        *sizep = 0;
+        return 0;
 }
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index 56f9234781fa..adc07102a20d 100644
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/bootmem.h>
+#include <linux/slab.h>
 
 /*
  * Data types ------------------------------------------------------------------
@@ -74,7 +75,7 @@ static struct attribute *def_attrs[] = {
         NULL
 };
 
-static struct sysfs_ops memmap_attr_ops = {
+static const struct sysfs_ops memmap_attr_ops = {
         .show = memmap_attr_show,
 };
 
@@ -122,29 +123,53 @@ static int firmware_map_add_entry(u64 start, u64 end,
         return 0;
 }
 
+/*
+ * Add memmap entry on sysfs
+ */
+static int add_sysfs_fw_map_entry(struct firmware_map_entry *entry)
+{
+        static int map_entries_nr;
+        static struct kset *mmap_kset;
+
+        if (!mmap_kset) {
+                mmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj);
+                if (!mmap_kset)
+                        return -ENOMEM;
+        }
+
+        entry->kobj.kset = mmap_kset;
+        if (kobject_add(&entry->kobj, NULL, "%d", map_entries_nr++))
+                kobject_put(&entry->kobj);
+
+        return 0;
+}
+
 /**
- * firmware_map_add() - Adds a firmware mapping entry.
+ * firmware_map_add_hotplug() - Adds a firmware mapping entry when we do
+ * memory hotplug.
  * @start: Start of the memory range.
  * @end:   End of the memory range (inclusive).
  * @type:  Type of the memory range.
  *
- * This function uses kmalloc() for memory
- * allocation. Use firmware_map_add_early() if you want to use the bootmem
- * allocator.
- *
- * That function must be called before late_initcall.
+ * Adds a firmware mapping entry. This function is for memory hotplug, it is
+ * similar to function firmware_map_add_early(). The only difference is that
+ * it will create the syfs entry dynamically.
  *
  * Returns 0 on success, or -ENOMEM if no memory could be allocated.
  **/
-int firmware_map_add(u64 start, u64 end, const char *type)
+int __meminit firmware_map_add_hotplug(u64 start, u64 end, const char *type)
 {
         struct firmware_map_entry *entry;
 
-        entry = kmalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC);
+        entry = kzalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC);
         if (!entry)
                 return -ENOMEM;
 
-        return firmware_map_add_entry(start, end, type, entry);
+        firmware_map_add_entry(start, end, type, entry);
+        /* create the memmap entry */
+        add_sysfs_fw_map_entry(entry);
+
+        return 0;
 }
 
 /**
@@ -154,7 +179,7 @@ int firmware_map_add(u64 start, u64 end, const char *type)
  * @type:  Type of the memory range.
  *
  * Adds a firmware mapping entry. This function uses the bootmem allocator
- * for memory allocation. Use firmware_map_add() if you want to use kmalloc().
+ * for memory allocation.
  *
  * That function must be called before late_initcall.
  *
@@ -214,19 +239,10 @@ static ssize_t memmap_attr_show(struct kobject *kobj,
  */
 static int __init memmap_init(void)
 {
-        int i = 0;
         struct firmware_map_entry *entry;
-        struct kset *memmap_kset;
-
-        memmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj);
-        if (WARN_ON(!memmap_kset))
-                return -ENOMEM;
 
-        list_for_each_entry(entry, &map_entries, list) {
-                entry->kobj.kset = memmap_kset;
-                if (kobject_add(&entry->kobj, NULL, "%d", i++))
-                        kobject_put(&entry->kobj);
-        }
+        list_for_each_entry(entry, &map_entries, list)
+                add_sysfs_fw_map_entry(entry);
 
         return 0;
 }