Merge branch 'next' (accumulated 3.16 merge window patches) into master

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

5 files changed, 31 insertions, 112 deletions

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 4d36932ca4f2..87fc96bcc13c 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -110,7 +110,7 @@ static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt2(get_time, tm, tc);
+        status = efi_call_virt(get_time, tm, tc);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -121,7 +121,7 @@ static efi_status_t virt_efi_set_time(efi_time_t *tm)
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt1(set_time, tm);
+        status = efi_call_virt(set_time, tm);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -134,8 +134,7 @@ static efi_status_t virt_efi_get_wakeup_time(efi_bool_t *enabled,
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt3(get_wakeup_time,
-                                enabled, pending, tm);
+        status = efi_call_virt(get_wakeup_time, enabled, pending, tm);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -146,8 +145,7 @@ static efi_status_t virt_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt2(set_wakeup_time,
-                                enabled, tm);
+        status = efi_call_virt(set_wakeup_time, enabled, tm);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -158,17 +156,17 @@ static efi_status_t virt_efi_get_variable(efi_char16_t *name,
                                           unsigned long *data_size,
                                           void *data)
 {
-        return efi_call_virt5(get_variable,
-                              name, vendor, attr,
-                              data_size, data);
+        return efi_call_virt(get_variable,
+                             name, vendor, attr,
+                             data_size, data);
 }
 
 static efi_status_t virt_efi_get_next_variable(unsigned long *name_size,
                                                efi_char16_t *name,
                                                efi_guid_t *vendor)
 {
-        return efi_call_virt3(get_next_variable,
-                              name_size, name, vendor);
+        return efi_call_virt(get_next_variable,
+                             name_size, name, vendor);
 }
 
 static efi_status_t virt_efi_set_variable(efi_char16_t *name,
@@ -177,9 +175,9 @@ static efi_status_t virt_efi_set_variable(efi_char16_t *name,
                                           unsigned long data_size,
                                           void *data)
 {
-        return efi_call_virt5(set_variable,
-                              name, vendor, attr,
-                              data_size, data);
+        return efi_call_virt(set_variable,
+                             name, vendor, attr,
+                             data_size, data);
 }
 
 static efi_status_t virt_efi_query_variable_info(u32 attr,
@@ -190,13 +188,13 @@ static efi_status_t virt_efi_query_variable_info(u32 attr,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        return efi_call_virt4(query_variable_info, attr, storage_space,
-                              remaining_space, max_variable_size);
+        return efi_call_virt(query_variable_info, attr, storage_space,
+                             remaining_space, max_variable_size);
 }
 
 static efi_status_t virt_efi_get_next_high_mono_count(u32 *count)
 {
-        return efi_call_virt1(get_next_high_mono_count, count);
+        return efi_call_virt(get_next_high_mono_count, count);
 }
 
 static void virt_efi_reset_system(int reset_type,
@@ -204,8 +202,8 @@ static void virt_efi_reset_system(int reset_type,
                                   unsigned long data_size,
                                   efi_char16_t *data)
 {
-        efi_call_virt4(reset_system, reset_type, status,
-                       data_size, data);
+        __efi_call_virt(reset_system, reset_type, status,
+                        data_size, data);
 }
 
 static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules,
@@ -215,7 +213,7 @@ static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        return efi_call_virt3(update_capsule, capsules, count, sg_list);
+        return efi_call_virt(update_capsule, capsules, count, sg_list);
 }
 
 static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
@@ -226,8 +224,8 @@ static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        return efi_call_virt4(query_capsule_caps, capsules, count, max_size,
-                              reset_type);
+        return efi_call_virt(query_capsule_caps, capsules, count, max_size,
+                             reset_type);
 }
 
 static efi_status_t __init phys_efi_set_virtual_address_map(
@@ -239,9 +237,9 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
         efi_status_t status;
 
         efi_call_phys_prelog();
-        status = efi_call_phys4(efi_phys.set_virtual_address_map,
-                                memory_map_size, descriptor_size,
-                                descriptor_version, virtual_map);
+        status = efi_call_phys(efi_phys.set_virtual_address_map,
+                               memory_map_size, descriptor_size,
+                               descriptor_version, virtual_map);
         efi_call_phys_epilog();
         return status;
 }
diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
index e0984ef0374b..5fcda7272550 100644
--- a/arch/x86/platform/efi/efi_stub_64.S
+++ b/arch/x86/platform/efi/efi_stub_64.S
@@ -73,84 +73,7 @@
         2:
         .endm
 
-ENTRY(efi_call0)
-        SAVE_XMM
-        subq $32, %rsp
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call0)
-
-ENTRY(efi_call1)
-        SAVE_XMM
-        subq $32, %rsp
-        mov  %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call1)
-
-ENTRY(efi_call2)
-        SAVE_XMM
-        subq $32, %rsp
-        mov  %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call2)
-
-ENTRY(efi_call3)
-        SAVE_XMM
-        subq $32, %rsp
-        mov  %rcx, %r8
-        mov  %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call3)
-
-ENTRY(efi_call4)
-        SAVE_XMM
-        subq $32, %rsp
-        mov %r8, %r9
-        mov %rcx, %r8
-        mov %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call4)
-
-ENTRY(efi_call5)
-        SAVE_XMM
-        subq $48, %rsp
-        mov %r9, 32(%rsp)
-        mov %r8, %r9
-        mov %rcx, %r8
-        mov %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $48, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call5)
-
-ENTRY(efi_call6)
+ENTRY(efi_call)
         SAVE_XMM
         mov (%rsp), %rax
         mov 8(%rax), %rax
@@ -166,7 +89,7 @@ ENTRY(efi_call6)
         addq $48, %rsp
         RESTORE_XMM
         ret
-ENDPROC(efi_call6)
+ENDPROC(efi_call)
 
 #ifdef CONFIG_EFI_MIXED
 
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 766612137a62..1584cbed0dce 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -39,7 +39,7 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)
                  */
                 return BIOS_STATUS_UNIMPLEMENTED;
 
-        ret = efi_call6((void *)__va(tab->function), (u64)which,
+        ret = efi_call((void *)__va(tab->function), (u64)which,
                         a1, a2, a3, a4, a5);
         return ret;
 }
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
index acf7752da952..b233681af4de 100644
--- a/arch/x86/platform/uv/uv_irq.c
+++ b/arch/x86/platform/uv/uv_irq.c
@@ -238,11 +238,9 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
 int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
                  unsigned long mmr_offset, int limit)
 {
-        int irq, ret;
+        int ret, irq = irq_alloc_hwirq(uv_blade_to_memory_nid(mmr_blade));
 
-        irq = create_irq_nr(NR_IRQS_LEGACY, uv_blade_to_memory_nid(mmr_blade));
-
-        if (irq <= 0)
+        if (!irq)
                 return -EBUSY;
 
         ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset,
@@ -250,7 +248,7 @@ int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
         if (ret == irq)
                 uv_set_irq_2_mmr_info(irq, mmr_offset, mmr_blade);
         else
-                destroy_irq(irq);
+                irq_free_hwirq(irq);
 
         return ret;
 }
@@ -285,6 +283,6 @@ void uv_teardown_irq(unsigned int irq)
                         n = n->rb_right;
         }
         spin_unlock_irqrestore(&uv_irq_lock, irqflags);
-        destroy_irq(irq);
+        irq_free_hwirq(irq);
 }
 EXPORT_SYMBOL_GPL(uv_teardown_irq);
diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index be27da60dc8f..c89c93320c12 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -85,7 +85,7 @@ static cpumask_var_t uv_nmi_cpu_mask;
  * Default is all stack dumps go to the console and buffer.
  * Lower level to send to log buffer only.
  */
-static int uv_nmi_loglevel = 7;
+static int uv_nmi_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
 module_param_named(dump_loglevel, uv_nmi_loglevel, int, 0644);
 
 /*