diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
| commit | 949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73 (patch) | |
| tree | 9a268cbb25992fdd7147e8af72f68d315ef4caeb /arch/arm/include/asm/assembler.h | |
| parent | 74374e40791f1f7b58252df275dd5227ead88b89 (diff) | |
| parent | bf6a68d2a214e07f7c0d6538e00e17b826714160 (diff) | |
| download | kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.zip kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.gz kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 65c3f24..4e25f18 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -137,6 +137,11 @@ disable_irq .endm + .macro save_and_disable_irqs_notrace, oldcpsr + mrs \oldcpsr, cpsr + disable_irq_notrace + .endm + /* * Restore interrupt state previously stored in a register. We don't * guarantee that this will preserve the flags. |