Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801194e3 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ 



DEFAULT_FIQ was entirely unused.  MODE_* are just redefinitions
of *_MODE.  Use *_MODE instead.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 405040a7

arch/arm/kernel/head-nommu.S

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
	__INIT

	.type	stext, %function

ENTRY(stext)

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode

						@ and irqs disabled

	mrc	p15, 0, r9, c0, c0		@ get processor id

	bl	__lookup_processor_type		@ r5=procinfo r9=cpuid

arch/arm/kernel/head.S

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
	__INIT

	.type	stext, %function

ENTRY(stext)

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode

						@ and irqs disabled

	mrc	p15, 0, r9, c0, c0		@ get processor id

	bl	__lookup_processor_type		@ r5=procinfo r9=cpuid
@@ -104,7 +104,7 @@ ENTRY(secondary_startup) 
	 * the processor type - there is no need to check the machine type

	 * as it has already been validated by the primary processor.

	 */

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE

	mrc	p15, 0, r9, c0, c0		@ get processor id

	bl	__lookup_processor_type

	movs	r10, r5				@ invalid processor?

arch/arm/mach-pxa/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ ENTRY(pxa_cpu_suspend) 
	.data

	.align 5

ENTRY(pxa_cpu_resume)

	mov	r0, #PSR_I_BIT | PSR_F_BIT | MODE_SVC	@ set SVC, irqs off

	mov	r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE	@ set SVC, irqs off

	msr	cpsr_c, r0



	ldr	r0, sleep_save_sp		@ stack phys addr

arch/arm/mach-s3c2410/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ s3c2410_sleep_save_phys: 
	*/



ENTRY(s3c2410_cpu_resume)

	mov	r0, #PSR_I_BIT | PSR_F_BIT | MODE_SVC

	mov	r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE

	msr	cpsr_c, r0



	@@ load UART to allow us to print the two characters for

arch/arm/mach-sa1100/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ sa1110_sdram_controller_fix: 
	.data

	.align 5

ENTRY(sa1100_cpu_resume)

	mov	r0, #PSR_F_BIT | PSR_I_BIT | MODE_SVC

	mov	r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE

	msr	cpsr_c, r0			@ set SVC, irqs off



	ldr	r0, sleep_save_sp		@ stack phys addr