Merge commit 'v3.4.9' into android-t114-3.4
Varun Wadekar [Thu, 23 Aug 2012 09:37:36 +0000 (14:37 +0530)]
Linux v3.4.9

Conflicts:
arch/arm/kernel/smp.c
arch/arm/vfp/entry.S

Change-Id: I731e815ed35ba9280374a5a3e5a6a8b6b805d695
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

1  2 
Makefile
arch/arm/include/asm/cacheflush.h
arch/arm/kernel/process.c
arch/arm/kernel/smp.c
arch/arm/kernel/traps.c
arch/arm/vfp/entry.S
drivers/hid/hid-multitouch.c
drivers/net/tun.c
sound/pci/hda/patch_conexant.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
@@@ -723,14 -575,23 +723,15 @@@ void smp_send_reschedule(int cpu
  void smp_send_stop(void)
  {
        unsigned long timeout;
 -      struct cpumask mask;
  
 -      cpumask_copy(&mask, cpu_online_mask);
 -      cpumask_clear_cpu(smp_processor_id(), &mask);
 -      if (!cpumask_empty(&mask))
 -              smp_cross_call(&mask, IPI_CPU_STOP);
 +      if (num_online_cpus() > 1) {
 +              struct cpumask mask;
 +              cpumask_copy(&mask, cpu_online_mask);
 +              cpumask_clear_cpu(smp_processor_id(), &mask);
 +
-               smp_cross_call(&mask, IPI_CPU_STOP);
++              if (!cpumask_empty(&mask))
++                      smp_cross_call(&mask, IPI_CPU_STOP);
 +      }
  
        /* Wait up to one second for other CPUs to stop */
        timeout = USEC_PER_SEC;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge