Merge branch 'master' into next

Conflicts:
	fs/cifs/misc.c

Merge to resolve above, per the patch below.

Signed-off-by: James Morris <jmorris@namei.org>

diff --cc fs/cifs/misc.c
index ec36410,addd1dc..0000000
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer
  		/*  BB Add support for establishing new tCon and SMB Session  */
  		/*      with userid/password pairs found on the smb session   */
  		/*	for other target tcp/ip addresses 		BB    */
 -				if (current->fsuid != treeCon->ses->linux_uid) {
 +				if (current_fsuid() != treeCon->ses->linux_uid) {
  					cFYI(1, ("Multiuser mode and UID "
  						 "did not match tcon uid"));
- 					read_lock(&GlobalSMBSeslock);
- 					list_for_each(temp_item, &GlobalSMBSessionList) {
- 						ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
+ 					read_lock(&cifs_tcp_ses_lock);
+ 					list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) {
+ 						ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list);
 -						if (ses->linux_uid == current->fsuid) {
 +						if (ses->linux_uid == current_fsuid()) {
  							if (ses->server == treeCon->ses->server) {
  								cFYI(1, ("found matching uid substitute right smb_uid"));
  								buffer->Uid = ses->Suid;

6 files changed, 33 insertions, 18 deletions

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index ed500ef799b7..08844fc24a2e 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -61,22 +61,25 @@ STACK_SIZE  = 1 << STACK_SHIFT
 
 #ifdef CONFIG_TRACE_IRQFLAGS
         .macro  TRACE_IRQS_ON
-        l       %r1,BASED(.Ltrace_irq_on)
+        basr    %r2,%r0
+        l       %r1,BASED(.Ltrace_irq_on_caller)
         basr    %r14,%r1
         .endm
 
         .macro  TRACE_IRQS_OFF
-        l       %r1,BASED(.Ltrace_irq_off)
+        basr    %r2,%r0
+        l       %r1,BASED(.Ltrace_irq_off_caller)
         basr    %r14,%r1
         .endm
 
         .macro  TRACE_IRQS_CHECK
+        basr    %r2,%r0
         tm      SP_PSW(%r15),0x03       # irqs enabled?
         jz      0f
-        l       %r1,BASED(.Ltrace_irq_on)
+        l       %r1,BASED(.Ltrace_irq_on_caller)
         basr    %r14,%r1
         j       1f
-0:      l       %r1,BASED(.Ltrace_irq_off)
+0:      l       %r1,BASED(.Ltrace_irq_off_caller)
         basr    %r14,%r1
 1:
         .endm
@@ -1113,9 +1116,12 @@ cleanup_io_leave_insn:
 .Lschedtail:    .long   schedule_tail
 .Lsysc_table:   .long   sys_call_table
 #ifdef CONFIG_TRACE_IRQFLAGS
-.Ltrace_irq_on: .long   trace_hardirqs_on
-.Ltrace_irq_off:
-                .long   trace_hardirqs_off
+.Ltrace_irq_on_caller:
+                .long   trace_hardirqs_on_caller
+.Ltrace_irq_off_caller:
+                .long   trace_hardirqs_off_caller
+#endif
+#ifdef CONFIG_LOCKDEP
 .Llockdep_sys_exit:
                 .long   lockdep_sys_exit
 #endif
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index d7ce150453f2..41aca06682aa 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -61,19 +61,22 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
 
 #ifdef CONFIG_TRACE_IRQFLAGS
         .macro  TRACE_IRQS_ON
-         brasl  %r14,trace_hardirqs_on
+         basr   %r2,%r0
+         brasl  %r14,trace_hardirqs_on_caller
         .endm
 
         .macro  TRACE_IRQS_OFF
-         brasl  %r14,trace_hardirqs_off
+         basr   %r2,%r0
+         brasl  %r14,trace_hardirqs_off_caller
         .endm
 
         .macro TRACE_IRQS_CHECK
+        basr    %r2,%r0
         tm      SP_PSW(%r15),0x03       # irqs enabled?
         jz      0f
-        brasl   %r14,trace_hardirqs_on
+        brasl   %r14,trace_hardirqs_on_caller
         j       1f
-0:      brasl   %r14,trace_hardirqs_off
+0:      brasl   %r14,trace_hardirqs_off_caller
 1:
         .endm
 #else
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 3e2c05cb6a87..04f8c67a6101 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -136,9 +136,12 @@ static void default_idle(void)
                 return;
         }
         trace_hardirqs_on();
+        /* Don't trace preempt off for idle. */
+        stop_critical_timings();
         /* Wait for external, I/O or machine check interrupt. */
         __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT |
                         PSW_MASK_IO | PSW_MASK_EXT);
+        start_critical_timings();
 }
 
 void cpu_idle(void)
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 62122bad1e33..400b040df7fa 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -604,13 +604,13 @@ setup_memory(void)
                 if (memory_chunk[i].type != CHUNK_READ_WRITE)
                         continue;
                 start_chunk = PFN_DOWN(memory_chunk[i].addr);
-                end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size) - 1;
+                end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size);
                 end_chunk = min(end_chunk, end_pfn);
                 if (start_chunk >= end_chunk)
                         continue;
                 add_active_range(0, start_chunk, end_chunk);
                 pfn = max(start_chunk, start_pfn);
-                for (; pfn <= end_chunk; pfn++)
+                for (; pfn < end_chunk; pfn++)
                         page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY);
         }
 
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 5fdb799062b7..4fe952e557ac 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -198,7 +198,7 @@ asmlinkage long s390x_newuname(struct new_utsname __user *name)
 {
         int ret = sys_newuname(name);
 
-        if (current->personality == PER_LINUX32 && !ret) {
+        if (personality(current->personality) == PER_LINUX32 && !ret) {
                 ret = copy_to_user(name->machine, "s390\0\0\0\0", 8);
                 if (ret) ret = -EFAULT;
         }
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 632b13e10053..a947899dcba1 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -65,18 +65,21 @@ static int machine_has_topology_irq;
 static struct timer_list topology_timer;
 static void set_topology_timer(void);
 static DECLARE_WORK(topology_work, topology_work_fn);
+/* topology_lock protects the core linked list */
+static DEFINE_SPINLOCK(topology_lock);
 
 cpumask_t cpu_core_map[NR_CPUS];
 
 cpumask_t cpu_coregroup_map(unsigned int cpu)
 {
         struct core_info *core = &core_info;
+        unsigned long flags;
         cpumask_t mask;
 
         cpus_clear(mask);
         if (!machine_has_topology)
                 return cpu_present_map;
-        mutex_lock(&smp_cpu_state_mutex);
+        spin_lock_irqsave(&topology_lock, flags);
         while (core) {
                 if (cpu_isset(cpu, core->mask)) {
                         mask = core->mask;
@@ -84,7 +87,7 @@ cpumask_t cpu_coregroup_map(unsigned int cpu)
                 }
                 core = core->next;
         }
-        mutex_unlock(&smp_cpu_state_mutex);
+        spin_unlock_irqrestore(&topology_lock, flags);
         if (cpus_empty(mask))
                 mask = cpumask_of_cpu(cpu);
         return mask;
@@ -133,7 +136,7 @@ static void tl_to_cores(struct tl_info *info)
         union tl_entry *tle, *end;
         struct core_info *core = &core_info;
 
-        mutex_lock(&smp_cpu_state_mutex);
+        spin_lock_irq(&topology_lock);
         clear_cores();
         tle = info->tle;
         end = (union tl_entry *)((unsigned long)info + info->length);
@@ -157,7 +160,7 @@ static void tl_to_cores(struct tl_info *info)
                 }
                 tle = next_tle(tle);
         }
-        mutex_unlock(&smp_cpu_state_mutex);
+        spin_unlock_irq(&topology_lock);
 }
 
 static void topology_update_polarization_simple(void)