linux-next: manual merge of the tip tree with the powerpc tree

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/powerpc/mm/numa.c

between commit:

  cee5405da402 ("powerpc/hotplug: Improve responsiveness of hotplug change")

from the powerpc tree and commit:

  df7e828c1b69 ("timer: Remove init_timer_deferrable() in favor of timer_setup()")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/mm/numa.c
index eb604b3574fa,73016451f330..000000000000
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@@ -1506,9 -1466,7 +1505,7 @@@ static struct timer_list topology_timer
  
  static void reset_topology_timer(void)
  {
- 	topology_timer.data = 0;
- 	topology_timer.expires = jiffies + topology_timer_secs * HZ;
- 	mod_timer(&topology_timer, topology_timer.expires);
 -	mod_timer(&topology_timer, jiffies + 60 * HZ);
++	mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);
  }
  
  #ifdef CONFIG_SMP
@@@ -1561,13 -1520,14 +1558,14 @@@ int start_topology_update(void
  			rc = of_reconfig_notifier_register(&dt_update_nb);
  #endif
  		}
 -	} else if (firmware_has_feature(FW_FEATURE_VPHN) &&
 +	}
 +	if (firmware_has_feature(FW_FEATURE_VPHN) &&
  		   lppaca_shared_proc(get_lppaca())) {
  		if (!vphn_enabled) {
 -			prrn_enabled = 0;
  			vphn_enabled = 1;
  			setup_cpu_associativity_change_counters();
- 			init_timer_deferrable(&topology_timer);
+ 			timer_setup(&topology_timer, topology_timer_fn,
+ 				    TIMER_DEFERRABLE);
  			reset_topology_timer();
  		}
  	}

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Kees Cook]

On Tue, Oct 31, 2017 at 10:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
>   arch/powerpc/mm/numa.c
>
> between commit:
>
>   cee5405da402 ("powerpc/hotplug: Improve responsiveness of hotplug change")
>
> from the powerpc tree and commit:
>
>   df7e828c1b69 ("timer: Remove init_timer_deferrable() in favor of timer_setup()")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/powerpc/mm/numa.c
> index eb604b3574fa,73016451f330..000000000000
> --- a/arch/powerpc/mm/numa.c
> +++ b/arch/powerpc/mm/numa.c
> @@@ -1506,9 -1466,7 +1505,7 @@@ static struct timer_list topology_timer
>
>   static void reset_topology_timer(void)
>   {
> -       topology_timer.data = 0;
> -       topology_timer.expires = jiffies + topology_timer_secs * HZ;
> -       mod_timer(&topology_timer, topology_timer.expires);
>  -      mod_timer(&topology_timer, jiffies + 60 * HZ);
> ++      mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);
>   }
>
>   #ifdef CONFIG_SMP
> @@@ -1561,13 -1520,14 +1558,14 @@@ int start_topology_update(void
>                         rc = of_reconfig_notifier_register(&dt_update_nb);
>   #endif
>                 }
>  -      } else if (firmware_has_feature(FW_FEATURE_VPHN) &&
>  +      }
>  +      if (firmware_has_feature(FW_FEATURE_VPHN) &&
>                    lppaca_shared_proc(get_lppaca())) {
>                 if (!vphn_enabled) {
>  -                      prrn_enabled = 0;
>                         vphn_enabled = 1;
>                         setup_cpu_associativity_change_counters();
> -                       init_timer_deferrable(&topology_timer);
> +                       timer_setup(&topology_timer, topology_timer_fn,
> +                                   TIMER_DEFERRABLE);
>                         reset_topology_timer();
>                 }
>         }

Thanks, this looks correct to me!

-Kees

-- 
Kees Cook
Pixel Security

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/powerpc/include/asm/livepatch.h

between commit:

  a4520b252765 ("powerpc/ftrace: Add support for livepatch to PPC32")

from the powerpc tree and commit:

  a557abfd1a16 ("x86/livepatch: Validate __fentry__ location")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/include/asm/livepatch.h
index 6f10de6af6e3,7b9dcd51af32..000000000000
--- a/arch/powerpc/include/asm/livepatch.h
+++ b/arch/powerpc/include/asm/livepatch.h
@@@ -14,21 -14,11 +14,11 @@@
  #ifdef CONFIG_LIVEPATCH
  static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)
  {
 -	struct pt_regs *regs = ftrace_get_regs(fregs);
 -
 -	regs_set_return_ip(regs, ip);
 +	ftrace_instruction_pointer_set(fregs, ip);
  }
- 
- #define klp_get_ftrace_location klp_get_ftrace_location
- static inline unsigned long klp_get_ftrace_location(unsigned long faddr)
- {
- 	/*
- 	 * Live patch works on PPC32 and only with -mprofile-kernel on PPC64. In
- 	 * both cases, the ftrace location is always within the first 16 bytes.
- 	 */
- 	return ftrace_location_range(faddr, faddr + 16);
- }
 +#endif /* CONFIG_LIVEPATCH */
  
 +#ifdef CONFIG_LIVEPATCH_64
  static inline void klp_init_thread_info(struct task_struct *p)
  {
  	/* + 1 to account for STACK_END_MAGIC */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/powerpc/include/asm/livepatch.h

between commit:

  a4520b252765 ("powerpc/ftrace: Add support for livepatch to PPC32")

from the powerpc tree and commit:

  a557abfd1a16 ("x86/livepatch: Validate __fentry__ location")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/include/asm/livepatch.h
index 6f10de6af6e3,7b9dcd51af32..000000000000
--- a/arch/powerpc/include/asm/livepatch.h
+++ b/arch/powerpc/include/asm/livepatch.h
@@@ -14,21 -14,11 +14,11 @@@
  #ifdef CONFIG_LIVEPATCH
  static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)
  {
 -	struct pt_regs *regs = ftrace_get_regs(fregs);
 -
 -	regs_set_return_ip(regs, ip);
 +	ftrace_instruction_pointer_set(fregs, ip);
  }
- 
- #define klp_get_ftrace_location klp_get_ftrace_location
- static inline unsigned long klp_get_ftrace_location(unsigned long faddr)
- {
- 	/*
- 	 * Live patch works on PPC32 and only with -mprofile-kernel on PPC64. In
- 	 * both cases, the ftrace location is always within the first 16 bytes.
- 	 */
- 	return ftrace_location_range(faddr, faddr + 16);
- }
 +#endif /* CONFIG_LIVEPATCH */
  
 +#ifdef CONFIG_LIVEPATCH_64
  static inline void klp_init_thread_info(struct task_struct *p)
  {
  	/* + 1 to account for STACK_END_MAGIC */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  kernel/kprobes.c

between commits:

  49e0b4658fe6 ("kprobes: Convert kprobe_lookup_name() to a function")
  290e3070762a ("powerpc/kprobes: Fix handling of function offsets on ABIv2")

from the powerpc tree and commit:

  1d585e70905e ("trace/kprobes: Fix check for kretprobe offset within function entry")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/kprobes.c
index 406889889ce5,c7ea9960433a..000000000000
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@@ -1395,16 -1394,14 +1398,14 @@@ bool within_kprobe_blacklist(unsigned l
   * This returns encoded errors if it fails to look up symbol or invalid
   * combination of parameters.
   */
- static kprobe_opcode_t *kprobe_addr(struct kprobe *p)
+ static kprobe_opcode_t *_kprobe_addr(kprobe_opcode_t *addr,
+ 			const char *symbol_name, unsigned int offset)
  {
- 	kprobe_opcode_t *addr = p->addr;
- 
- 	if ((p->symbol_name && p->addr) ||
- 	    (!p->symbol_name && !p->addr))
+ 	if ((symbol_name && addr) || (!symbol_name && !addr))
  		goto invalid;
  
- 	if (p->symbol_name) {
- 		addr = kprobe_lookup_name(p->symbol_name, p->offset);
+ 	if (symbol_name) {
 -		kprobe_lookup_name(symbol_name, addr);
++		addr = kprobe_lookup_name(symbol_name, offset);
  		if (!addr)
  			return ERR_PTR(-ENOENT);
  	}

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

On Fri, 17 Feb 2017 12:48:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/powerpc/kernel/asm-offsets.c
> 
> between commit:
> 
>   454656155110 ("powerpc/asm: Use OFFSET macro in asm-offsets.c")
> 
> from the powerpc tree and commit:
> 
>   8c8b73c4811f ("sched/cputime, powerpc: Prepare accounting structure for cputime flush on tick")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/powerpc/kernel/asm-offsets.c
> index d918338b54b0,9e8e771f8acb..000000000000
> --- a/arch/powerpc/kernel/asm-offsets.c
> +++ b/arch/powerpc/kernel/asm-offsets.c
> @@@ -208,48 -213,58 +208,48 @@@ int main(void
>   #endif /* CONFIG_PPC_BOOK3E */
>   
>   #ifdef CONFIG_PPC_STD_MMU_64
>  -	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
>  -	DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
>  -	DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
>  +	OFFSET(PACASLBCACHE, paca_struct, slb_cache);
>  +	OFFSET(PACASLBCACHEPTR, paca_struct, slb_cache_ptr);
>  +	OFFSET(PACAVMALLOCSLLP, paca_struct, vmalloc_sllp);
>   #ifdef CONFIG_PPC_MM_SLICES
>  -	DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));
>  +	OFFSET(MMUPSIZESLLP, mmu_psize_def, sllp);
>   #else
>  -	DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, mm_ctx_sllp));
>  +	OFFSET(PACACONTEXTSLLP, paca_struct, mm_ctx_sllp);
>   #endif /* CONFIG_PPC_MM_SLICES */
>  -	DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
>  -	DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
>  -	DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));
>  -	DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
>  -	DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
>  -	DEFINE(SLBSHADOW_STACKVSID,
>  -	       offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));
>  -	DEFINE(SLBSHADOW_STACKESID,
>  -	       offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));
>  -	DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
>  -	DEFINE(LPPACA_PMCINUSE, offsetof(struct lppaca, pmcregs_in_use));
>  -	DEFINE(LPPACA_DTLIDX, offsetof(struct lppaca, dtl_idx));
>  -	DEFINE(LPPACA_YIELDCOUNT, offsetof(struct lppaca, yield_count));
>  -	DEFINE(PACA_DTL_RIDX, offsetof(struct paca_struct, dtl_ridx));
>  +	OFFSET(PACA_EXGEN, paca_struct, exgen);
>  +	OFFSET(PACA_EXMC, paca_struct, exmc);
>  +	OFFSET(PACA_EXSLB, paca_struct, exslb);
>  +	OFFSET(PACALPPACAPTR, paca_struct, lppaca_ptr);
>  +	OFFSET(PACA_SLBSHADOWPTR, paca_struct, slb_shadow_ptr);
>  +	OFFSET(SLBSHADOW_STACKVSID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid);
>  +	OFFSET(SLBSHADOW_STACKESID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid);
>  +	OFFSET(SLBSHADOW_SAVEAREA, slb_shadow, save_area);
>  +	OFFSET(LPPACA_PMCINUSE, lppaca, pmcregs_in_use);
>  +	OFFSET(LPPACA_DTLIDX, lppaca, dtl_idx);
>  +	OFFSET(LPPACA_YIELDCOUNT, lppaca, yield_count);
>  +	OFFSET(PACA_DTL_RIDX, paca_struct, dtl_ridx);
>   #endif /* CONFIG_PPC_STD_MMU_64 */
>  -	DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
>  +	OFFSET(PACAEMERGSP, paca_struct, emergency_sp);
>   #ifdef CONFIG_PPC_BOOK3S_64
>  -	DEFINE(PACAMCEMERGSP, offsetof(struct paca_struct, mc_emergency_sp));
>  -	DEFINE(PACA_IN_MCE, offsetof(struct paca_struct, in_mce));
>  -#endif
>  -	DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
>  -	DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));
>  -	DEFINE(PACA_DSCR_DEFAULT, offsetof(struct paca_struct, dscr_default));
>  -	DEFINE(ACCOUNT_STARTTIME,
>  -	       offsetof(struct paca_struct, accounting.starttime));
>  -	DEFINE(ACCOUNT_STARTTIME_USER,
>  -	       offsetof(struct paca_struct, accounting.starttime_user));
>  -	DEFINE(ACCOUNT_USER_TIME,
>  -	       offsetof(struct paca_struct, accounting.utime));
>  -	DEFINE(ACCOUNT_SYSTEM_TIME,
>  -	       offsetof(struct paca_struct, accounting.stime));
>  -	DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));
>  -	DEFINE(PACA_NAPSTATELOST, offsetof(struct paca_struct, nap_state_lost));
>  -	DEFINE(PACA_SPRG_VDSO, offsetof(struct paca_struct, sprg_vdso));
>  +	OFFSET(PACAMCEMERGSP, paca_struct, mc_emergency_sp);
>  +	OFFSET(PACA_IN_MCE, paca_struct, in_mce);
>  +#endif
>  +	OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id);
>  +	OFFSET(PACAKEXECSTATE, paca_struct, kexec_state);
>  +	OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default);
>  +	OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime);
>  +	OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user);
> - 	OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.user_time);
> - 	OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.system_time);
> ++	OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime);
> ++	OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime);
>  +	OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save);
>  +	OFFSET(PACA_NAPSTATELOST, paca_struct, nap_state_lost);
>  +	OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso);
>   #else /* CONFIG_PPC64 */
>   #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
>  -	DEFINE(ACCOUNT_STARTTIME,
>  -	       offsetof(struct thread_info, accounting.starttime));
>  -	DEFINE(ACCOUNT_STARTTIME_USER,
>  -	       offsetof(struct thread_info, accounting.starttime_user));
>  -	DEFINE(ACCOUNT_USER_TIME,
>  -	       offsetof(struct thread_info, accounting.utime));
>  -	DEFINE(ACCOUNT_SYSTEM_TIME,
>  -	       offsetof(struct thread_info, accounting.stime));
>  +	OFFSET(ACCOUNT_STARTTIME, thread_info, accounting.starttime);
>  +	OFFSET(ACCOUNT_STARTTIME_USER, thread_info, accounting.starttime_user);
> - 	OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.user_time);
> - 	OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.system_time);
> ++	OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.utime);
> ++	OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.stime);
>   #endif
>   #endif /* CONFIG_PPC64 */
>   

This is now a conflict between the powerpc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/powerpc/kernel/asm-offsets.c

between commit:

  454656155110 ("powerpc/asm: Use OFFSET macro in asm-offsets.c")

from the powerpc tree and commit:

  8c8b73c4811f ("sched/cputime, powerpc: Prepare accounting structure for cputime flush on tick")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/kernel/asm-offsets.c
index d918338b54b0,9e8e771f8acb..000000000000
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@@ -208,48 -213,58 +208,48 @@@ int main(void
  #endif /* CONFIG_PPC_BOOK3E */
  
  #ifdef CONFIG_PPC_STD_MMU_64
 -	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
 -	DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
 -	DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
 +	OFFSET(PACASLBCACHE, paca_struct, slb_cache);
 +	OFFSET(PACASLBCACHEPTR, paca_struct, slb_cache_ptr);
 +	OFFSET(PACAVMALLOCSLLP, paca_struct, vmalloc_sllp);
  #ifdef CONFIG_PPC_MM_SLICES
 -	DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));
 +	OFFSET(MMUPSIZESLLP, mmu_psize_def, sllp);
  #else
 -	DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, mm_ctx_sllp));
 +	OFFSET(PACACONTEXTSLLP, paca_struct, mm_ctx_sllp);
  #endif /* CONFIG_PPC_MM_SLICES */
 -	DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
 -	DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
 -	DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));
 -	DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
 -	DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
 -	DEFINE(SLBSHADOW_STACKVSID,
 -	       offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));
 -	DEFINE(SLBSHADOW_STACKESID,
 -	       offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));
 -	DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
 -	DEFINE(LPPACA_PMCINUSE, offsetof(struct lppaca, pmcregs_in_use));
 -	DEFINE(LPPACA_DTLIDX, offsetof(struct lppaca, dtl_idx));
 -	DEFINE(LPPACA_YIELDCOUNT, offsetof(struct lppaca, yield_count));
 -	DEFINE(PACA_DTL_RIDX, offsetof(struct paca_struct, dtl_ridx));
 +	OFFSET(PACA_EXGEN, paca_struct, exgen);
 +	OFFSET(PACA_EXMC, paca_struct, exmc);
 +	OFFSET(PACA_EXSLB, paca_struct, exslb);
 +	OFFSET(PACALPPACAPTR, paca_struct, lppaca_ptr);
 +	OFFSET(PACA_SLBSHADOWPTR, paca_struct, slb_shadow_ptr);
 +	OFFSET(SLBSHADOW_STACKVSID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid);
 +	OFFSET(SLBSHADOW_STACKESID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid);
 +	OFFSET(SLBSHADOW_SAVEAREA, slb_shadow, save_area);
 +	OFFSET(LPPACA_PMCINUSE, lppaca, pmcregs_in_use);
 +	OFFSET(LPPACA_DTLIDX, lppaca, dtl_idx);
 +	OFFSET(LPPACA_YIELDCOUNT, lppaca, yield_count);
 +	OFFSET(PACA_DTL_RIDX, paca_struct, dtl_ridx);
  #endif /* CONFIG_PPC_STD_MMU_64 */
 -	DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
 +	OFFSET(PACAEMERGSP, paca_struct, emergency_sp);
  #ifdef CONFIG_PPC_BOOK3S_64
 -	DEFINE(PACAMCEMERGSP, offsetof(struct paca_struct, mc_emergency_sp));
 -	DEFINE(PACA_IN_MCE, offsetof(struct paca_struct, in_mce));
 -#endif
 -	DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
 -	DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));
 -	DEFINE(PACA_DSCR_DEFAULT, offsetof(struct paca_struct, dscr_default));
 -	DEFINE(ACCOUNT_STARTTIME,
 -	       offsetof(struct paca_struct, accounting.starttime));
 -	DEFINE(ACCOUNT_STARTTIME_USER,
 -	       offsetof(struct paca_struct, accounting.starttime_user));
 -	DEFINE(ACCOUNT_USER_TIME,
 -	       offsetof(struct paca_struct, accounting.utime));
 -	DEFINE(ACCOUNT_SYSTEM_TIME,
 -	       offsetof(struct paca_struct, accounting.stime));
 -	DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));
 -	DEFINE(PACA_NAPSTATELOST, offsetof(struct paca_struct, nap_state_lost));
 -	DEFINE(PACA_SPRG_VDSO, offsetof(struct paca_struct, sprg_vdso));
 +	OFFSET(PACAMCEMERGSP, paca_struct, mc_emergency_sp);
 +	OFFSET(PACA_IN_MCE, paca_struct, in_mce);
 +#endif
 +	OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id);
 +	OFFSET(PACAKEXECSTATE, paca_struct, kexec_state);
 +	OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default);
 +	OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime);
 +	OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user);
- 	OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.user_time);
- 	OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.system_time);
++	OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime);
++	OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime);
 +	OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save);
 +	OFFSET(PACA_NAPSTATELOST, paca_struct, nap_state_lost);
 +	OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso);
  #else /* CONFIG_PPC64 */
  #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
 -	DEFINE(ACCOUNT_STARTTIME,
 -	       offsetof(struct thread_info, accounting.starttime));
 -	DEFINE(ACCOUNT_STARTTIME_USER,
 -	       offsetof(struct thread_info, accounting.starttime_user));
 -	DEFINE(ACCOUNT_USER_TIME,
 -	       offsetof(struct thread_info, accounting.utime));
 -	DEFINE(ACCOUNT_SYSTEM_TIME,
 -	       offsetof(struct thread_info, accounting.stime));
 +	OFFSET(ACCOUNT_STARTTIME, thread_info, accounting.starttime);
 +	OFFSET(ACCOUNT_STARTTIME_USER, thread_info, accounting.starttime_user);
- 	OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.user_time);
- 	OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.system_time);
++	OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.utime);
++	OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.stime);
  #endif
  #endif /* CONFIG_PPC64 */
  

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/platforms/iseries/setup.c between commit 8ee3e0d69623
("powerpc: Remove the main legacy iSerie platform code") from the powerpc
tree and commit bd2f55361f18 ("sched/rt: Use schedule_preempt_disabled()")
from the tip tree.

The former removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/platforms/iseries/setup.c between commit 8ee3e0d69623
("powerpc: Remove the main legacy iSerie platform code") from the powerpc
tree and commit bd2f55361f18 ("sched/rt: Use schedule_preempt_disabled()")
from the tip tree.

The former removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/platforms/iseries/setup.c between commit 8ee3e0d69623
("powerpc: Remove the main legacy iSerie platform code") from the powerpc
tree and commit bd2f55361f18 ("sched/rt: Use schedule_preempt_disabled()")
from the tip tree.

The former removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Benjamin Herrenschmidt]

On Fri, 2011-05-20 at 14:14 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
> Consolidate ipi message mux and demux") from the powerpc tree and commit
> 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
> smp_send_reschedule()") from the tip tree.
> 
> The former superceded part of the latter's changes, so I just used the
> former for that.

I've done the merge and resolved the conflict properly (it's actually
non trivial due to some other changes) in the powerpc tree, I'll send a
pull request to Linus later today.

Cheers,
Ben.

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Benjamin Herrenschmidt]

On Fri, 2011-05-20 at 14:14 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
> Consolidate ipi message mux and demux") from the powerpc tree and commit
> 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
> smp_send_reschedule()") from the tip tree.
> 
> The former superceded part of the latter's changes, so I just used the
> former for that.

I've done the merge and resolved the conflict properly (it's actually
non trivial due to some other changes) in the powerpc tree, I'll send a
pull request to Linus later today.

Cheers,
Ben.

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
Consolidate ipi message mux and demux") from the powerpc tree and commit
184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
smp_send_reschedule()") from the tip tree.

The former superceded part of the latter's changes, so I just used the
former for that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
Consolidate ipi message mux and demux") from the powerpc tree and commit
184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
smp_send_reschedule()") from the tip tree.

The former superceded part of the latter's changes, so I just used the
former for that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
Consolidate ipi message mux and demux") from the powerpc tree and commit
184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
smp_send_reschedule()") from the tip tree.

The former superceded part of the latter's changes, so I just used the
former for that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi again,

On Tue, 19 Oct 2010 15:48:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/time.c between commit
> cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
> timebase rather than PURR") from the powerpc tree and commit
> e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
> context callbacks") from the tip tree.
> 
> Just context changes.  I fixed it up and can carry the fix as necessary.

I forgot the merge diff, sorry:

diff --cc arch/powerpc/kernel/time.c
index 644f918,54888eb..0000000
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@@ -578,9 -585,11 +578,9 @@@ void timer_interrupt(struct pt_regs * r
  	old_regs = set_irq_regs(regs);
  	irq_enter();
  
- 	if (test_perf_event_pending()) {
- 		clear_perf_event_pending();
- 		perf_event_do_pending();
 -	calculate_steal_time();
 -
+ 	if (test_irq_work_pending()) {
+ 		clear_irq_work_pending();
+ 		irq_work_run();
  	}
  
  #ifdef CONFIG_PPC_ISERIES

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

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi again,

On Tue, 19 Oct 2010 15:48:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/time.c between commit
> cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
> timebase rather than PURR") from the powerpc tree and commit
> e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
> context callbacks") from the tip tree.
> 
> Just context changes.  I fixed it up and can carry the fix as necessary.

I forgot the merge diff, sorry:

diff --cc arch/powerpc/kernel/time.c
index 644f918,54888eb..0000000
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@@ -578,9 -585,11 +578,9 @@@ void timer_interrupt(struct pt_regs * r
  	old_regs = set_irq_regs(regs);
  	irq_enter();
  
- 	if (test_perf_event_pending()) {
- 		clear_perf_event_pending();
- 		perf_event_do_pending();
 -	calculate_steal_time();
 -
+ 	if (test_irq_work_pending()) {
+ 		clear_irq_work_pending();
+ 		irq_work_run();
  	}
  
  #ifdef CONFIG_PPC_ISERIES

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

Re: linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi again,

On Tue, 19 Oct 2010 15:48:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/time.c between commit
> cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
> timebase rather than PURR") from the powerpc tree and commit
> e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
> context callbacks") from the tip tree.
> 
> Just context changes.  I fixed it up and can carry the fix as necessary.

I forgot the merge diff, sorry:

diff --cc arch/powerpc/kernel/time.c
index 644f918,54888eb..0000000
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@@ -578,9 -585,11 +578,9 @@@ void timer_interrupt(struct pt_regs * r
  	old_regs = set_irq_regs(regs);
  	irq_enter();
  
- 	if (test_perf_event_pending()) {
- 		clear_perf_event_pending();
- 		perf_event_do_pending();
 -	calculate_steal_time();
 -
+ 	if (test_irq_work_pending()) {
+ 		clear_irq_work_pending();
+ 		irq_work_run();
  	}
  
  #ifdef CONFIG_PPC_ISERIES

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

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/time.c between commit
cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
timebase rather than PURR") from the powerpc tree and commit
e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
context callbacks") from the tip tree.

Just context changes.  I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/time.c between commit
cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
timebase rather than PURR") from the powerpc tree and commit
e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
context callbacks") from the tip tree.

Just context changes.  I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/time.c between commit
cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
timebase rather than PURR") from the powerpc tree and commit
e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
context callbacks") from the tip tree.

Just context changes.  I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: manual merge of the tip tree with the powerpc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got some complex a conflicts in
arch/powerpc/kernel/time.c between a couple of commits from the powerpc
tree and a set of commits from the tip tree.

Since John has posted a new revision of the patches that are in the tip
tree that will resolve these conflicts. I just used the tip tree from
next-20100727 for today (and hope this will be better tomorrow).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]