diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
| commit | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (patch) | |
| tree | b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3 /arch/sparc/include/asm/irqflags_64.h | |
| parent | ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| download | kernel_samsung_tuna-4e111751cfcb75f26d2725eab934b6eb91a3d115.zip kernel_samsung_tuna-4e111751cfcb75f26d2725eab934b6eb91a3d115.tar.gz kernel_samsung_tuna-4e111751cfcb75f26d2725eab934b6eb91a3d115.tar.bz2 | |
Merge commit 'v3.0' into android-3.0
Diffstat (limited to 'arch/sparc/include/asm/irqflags_64.h')
| -rw-r--r-- | arch/sparc/include/asm/irqflags_64.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h index aab969c..23cd27f 100644 --- a/arch/sparc/include/asm/irqflags_64.h +++ b/arch/sparc/include/asm/irqflags_64.h @@ -14,7 +14,7 @@ #ifndef __ASSEMBLY__ -static inline unsigned long arch_local_save_flags(void) +static inline notrace unsigned long arch_local_save_flags(void) { unsigned long flags; @@ -26,7 +26,7 @@ static inline unsigned long arch_local_save_flags(void) return flags; } -static inline void arch_local_irq_restore(unsigned long flags) +static inline notrace void arch_local_irq_restore(unsigned long flags) { __asm__ __volatile__( "wrpr %0, %%pil" @@ -36,7 +36,7 @@ static inline void arch_local_irq_restore(unsigned long flags) ); } -static inline void arch_local_irq_disable(void) +static inline notrace void arch_local_irq_disable(void) { __asm__ __volatile__( "wrpr %0, %%pil" @@ -46,7 +46,7 @@ static inline void arch_local_irq_disable(void) ); } -static inline void arch_local_irq_enable(void) +static inline notrace void arch_local_irq_enable(void) { __asm__ __volatile__( "wrpr 0, %%pil" @@ -56,17 +56,17 @@ static inline void arch_local_irq_enable(void) ); } -static inline int arch_irqs_disabled_flags(unsigned long flags) +static inline notrace int arch_irqs_disabled_flags(unsigned long flags) { return (flags > 0); } -static inline int arch_irqs_disabled(void) +static inline notrace int arch_irqs_disabled(void) { return arch_irqs_disabled_flags(arch_local_save_flags()); } -static inline unsigned long arch_local_irq_save(void) +static inline notrace unsigned long arch_local_irq_save(void) { unsigned long flags, tmp; |