2 files changed, 10 insertions, 6 deletions

diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 777fba48d2d3..3009e0171e54 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -244,7 +244,7 @@ static ssize_t host_control_on_shutdown_store(struct device *dev,
  */
 int dcdbas_smi_request(struct smi_cmd *smi_cmd)
 {
-        cpumask_t old_mask;
+        cpumask_var_t old_mask;
         int ret = 0;
 
         if (smi_cmd->magic != SMI_CMD_MAGIC) {
@@ -254,8 +254,11 @@ int dcdbas_smi_request(struct smi_cmd *smi_cmd)
         }
 
         /* SMI requires CPU 0 */
-        old_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, &cpumask_of_cpu(0));
+        if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))
+                return -ENOMEM;
+
+        cpumask_copy(old_mask, &current->cpus_allowed);
+        set_cpus_allowed_ptr(current, cpumask_of(0));
         if (smp_processor_id() != 0) {
                 dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
                         __func__);
@@ -275,7 +278,8 @@ int dcdbas_smi_request(struct smi_cmd *smi_cmd)
         );
 
 out:
-        set_cpus_allowed_ptr(current, &old_mask);
+        set_cpus_allowed_ptr(current, old_mask);
+        free_cpumask_var(old_mask);
         return ret;
 }
 
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 3ab3e4a41d67..7b7ddc2d51c9 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -938,8 +938,8 @@ static int __init ibft_init(void)
                 return -ENOMEM;
 
         if (ibft_addr) {
-                printk(KERN_INFO "iBFT detected at 0x%lx.\n",
-                       virt_to_phys((void *)ibft_addr));
+                printk(KERN_INFO "iBFT detected at 0x%llx.\n",
+                       (u64)virt_to_phys((void *)ibft_addr));
 
                 rc = ibft_check_device();
                 if (rc)