linux-next: manual merge of the cpuinit tree with the arm-currenttree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the cpuinit tree got a conflict in
arch/arm/mm/proc-v7.S between commit 3e0a07f8c401 ("ARM: 7773/1: PJ4B:
Add support for errata 4742") from the arm-current tree and commit "arm:
delete __cpuinit/__CPUINIT usage from all ARM users" from the cpuinit
tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mm/proc-v7.S
index 7ef3ad0,64b3acb..0000000
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -144,31 -144,6 +144,29 @@@ ENTRY(cpu_v7_do_resume
  ENDPROC(cpu_v7_do_resume)
  #endif
  
 +#ifdef CONFIG_CPU_PJ4B
 +	globl_equ	cpu_pj4b_switch_mm,     cpu_v7_switch_mm
 +	globl_equ	cpu_pj4b_set_pte_ext,	cpu_v7_set_pte_ext
 +	globl_equ	cpu_pj4b_proc_init,	cpu_v7_proc_init
 +	globl_equ	cpu_pj4b_proc_fin, 	cpu_v7_proc_fin
 +	globl_equ	cpu_pj4b_reset,	   	cpu_v7_reset
 +#ifdef CONFIG_PJ4B_ERRATA_4742
 +ENTRY(cpu_pj4b_do_idle)
 +	dsb					@ WFI may enter a low-power mode
 +	wfi
 +	dsb					@barrier
 +	mov	pc, lr
 +ENDPROC(cpu_pj4b_do_idle)
 +#else
 +	globl_equ	cpu_pj4b_do_idle,  	cpu_v7_do_idle
 +#endif
 +	globl_equ	cpu_pj4b_dcache_clean_area,	cpu_v7_dcache_clean_area
 +	globl_equ	cpu_pj4b_do_suspend,	cpu_v7_do_suspend
 +	globl_equ	cpu_pj4b_do_resume,	cpu_v7_do_resume
 +	globl_equ	cpu_pj4b_suspend_size,	cpu_v7_suspend_size
 +
 +#endif
 +
- 	__CPUINIT
- 
  /*
   *	__v7_setup
   *

Attachment: pgp00000.pgp
Description: PGP signature