Subject: linux-next: manual merge of the percpu tree with the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 7 Oct 2014 16:37:42 +1100

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/s390/kernel/processor.c between commit dfcc8c377711 ("s390/vtime:
do not reset idle data on CPU hotplug") from the s390 tree and commit
eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/s390/kernel/processor.c
index edefead3b43a,f0305b1189aa..000000000000
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@@ -23,7 -23,8 +23,7 @@@ static DEFINE_PER_CPU(struct cpuid, cpu
   */
  void cpu_init(void)
  {
- 	struct cpuid *id = &__get_cpu_var(cpu_id);
 -	struct s390_idle_data *idle = this_cpu_ptr(&s390_idle);
+ 	struct cpuid *id = this_cpu_ptr(&cpu_id);
  
  	get_cpu_id(id);
  	atomic_inc(&init_mm.mm_count);