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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 497 bytes --]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/s390/include/asm/cputime.h between commit 201b275f0459
("s390/nohz: use a per-cpu flag for arch_needs_cpu") from the s390 tree
and commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the
percpu tree.

I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/s390/kernel/vtime.c between commit 4dc0f1e9c0a9 ("s390/idle:
consolidate idle functions and definitions") from the s390 tree and
commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the
percpu tree.

I fixed it up (the former moved the code modified by the latter into a
new file, so I just removed the code and added the patch below) and can
carry the fix as necessary (no action is required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Oct 2014 16:44:38 +1100
Subject: [PATCH] s390: fixup for Replace __get_cpu_var uses

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/s390/kernel/idle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index c75fbae1e37e..9d19a91dc6a6 100644
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -20,7 +20,7 @@ static DEFINE_PER_CPU(struct s390_idle_data, s390_idle);
 
 void __kprobes enabled_wait(void)
 {
-	struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
+	struct s390_idle_data *idle = this_cpu_ptr(&s390_idle);
 	unsigned long long idle_time;
 	unsigned long psw_mask;
 
-- 
2.1.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

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                    sfr@canb.auug.org.au

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);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/s390/kernel/irq.c between commit 201b275f0459 ("s390/nohz: use a
per-cpu flag for arch_needs_cpu") from the s390 tree and commit
eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree.

I fixed it up (the former changed the
"__get_cpu_var(s390_idle).nohz_delay = 1" into
"set_cpu_flag(CIF_NOHZ_DELAY)", so I used that) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]