From 7999d8d7a611bee902446939952859caf1367c25 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 25 Jun 2006 11:17:23 +0100 Subject: [ARM] Remove RETINSTR macro RETINSTR is a left-over from the days when we had 26-bit and 32-bit CPU support integrated into the same tree. Since this is no longer the case, we can now remove RETINSTR. Signed-off-by: Russell King --- include/asm-arm/assembler.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include') diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h index d53bafa..930dd90 100644 --- a/include/asm-arm/assembler.h +++ b/include/asm-arm/assembler.h @@ -74,12 +74,6 @@ #endif /* - * Build a return instruction for this processor type. - */ -#define RETINSTR(instr, regs...)\ - instr regs - -/* * Enable and disable interrupts */ #if __LINUX_ARM_ARCH__ >= 6 -- cgit v1.1 From 1b93a71755f2b15450b3e3045dab58a633e37b18 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 25 Jun 2006 11:23:45 +0100 Subject: [ARM] Remove LOADREGS macro As for RETINSTR, LOADREGS is a left-over from the 26-bit days. Remove it. Signed-off-by: Russell King --- include/asm-arm/assembler.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'include') diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h index 930dd90..add451a 100644 --- a/include/asm-arm/assembler.h +++ b/include/asm-arm/assembler.h @@ -63,17 +63,6 @@ #define DEFAULT_FIQ MODE_FIQ /* - * LOADREGS - ldm with PC in register list (eg, ldmfd sp!, {pc}) - */ -#ifdef __STDC__ -#define LOADREGS(cond, base, reglist...)\ - ldm##cond base,reglist -#else -#define LOADREGS(cond, base, reglist...)\ - ldm/**/cond base,reglist -#endif - -/* * Enable and disable interrupts */ #if __LINUX_ARM_ARCH__ >= 6 -- cgit v1.1 From 405040a78b33e39edf4180fc993b9608f07d3c41 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 25 Jun 2006 11:37:09 +0100 Subject: [ARM] Remove save_lr/restore_pc macros As for RETINSTR/LOADREGS macros, these were for compatibility with 26-bit ARMs. No longer required, so remove them. Signed-off-by: Russell King --- include/asm-arm/assembler.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'include') diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h index add451a..b97cb3e 100644 --- a/include/asm-arm/assembler.h +++ b/include/asm-arm/assembler.h @@ -100,18 +100,6 @@ msr cpsr_c, \oldcpsr .endm -/* - * These two are used to save LR/restore PC over a user-based access. - * The old 26-bit architecture requires that we do. On 32-bit - * architecture, we can safely ignore this requirement. - */ - .macro save_lr - .endm - - .macro restore_pc - mov pc, lr - .endm - #define USER(x...) \ 9999: x; \ .section __ex_table,"a"; \ -- cgit v1.1 From 801194e3bcf7cde163b23c6279c559e69cb4ca57 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 25 Jun 2006 12:01:48 +0100 Subject: [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: Russell King --- include/asm-arm/assembler.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include') diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h index b97cb3e..fce8328 100644 --- a/include/asm-arm/assembler.h +++ b/include/asm-arm/assembler.h @@ -55,13 +55,6 @@ #define PLD(code...) #endif -#define MODE_USR USR_MODE -#define MODE_FIQ FIQ_MODE -#define MODE_IRQ IRQ_MODE -#define MODE_SVC SVC_MODE - -#define DEFAULT_FIQ MODE_FIQ - /* * Enable and disable interrupts */ -- cgit v1.1