diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 02:34:51 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 02:34:51 -0400 |
| commit | 31b37c73c56b4129ff22436af97b77719a4db852 (patch) | |
| tree | f71a3b50e4c3eccac9f52d5e973db8f6596c9a49 /arch/sh/kernel | |
| parent | 071a1e33bac5c4ff8667d074be58365bd164b350 (diff) | |
sh64: update for IRQ flag handling naming changes.
irq_32.c was updated for the new API, while irq_64.c was overlooked. This
syncs them up and gets things building again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/irq_64.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sh/kernel/irq_64.c b/arch/sh/kernel/irq_64.c index 32365ba0e039..8fc05b997b6d 100644 --- a/arch/sh/kernel/irq_64.c +++ b/arch/sh/kernel/irq_64.c | |||
| @@ -11,17 +11,17 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <cpu/registers.h> | 12 | #include <cpu/registers.h> |
| 13 | 13 | ||
| 14 | void notrace raw_local_irq_restore(unsigned long flags) | 14 | void notrace arch_local_irq_restore(unsigned long flags) |
| 15 | { | 15 | { |
| 16 | unsigned long long __dummy; | 16 | unsigned long long __dummy; |
| 17 | 17 | ||
| 18 | if (flags == RAW_IRQ_DISABLED) { | 18 | if (flags == ARCH_IRQ_DISABLED) { |
| 19 | __asm__ __volatile__ ( | 19 | __asm__ __volatile__ ( |
| 20 | "getcon " __SR ", %0\n\t" | 20 | "getcon " __SR ", %0\n\t" |
| 21 | "or %0, %1, %0\n\t" | 21 | "or %0, %1, %0\n\t" |
| 22 | "putcon %0, " __SR "\n\t" | 22 | "putcon %0, " __SR "\n\t" |
| 23 | : "=&r" (__dummy) | 23 | : "=&r" (__dummy) |
| 24 | : "r" (RAW_IRQ_DISABLED) | 24 | : "r" (ARCH_IRQ_DISABLED) |
| 25 | ); | 25 | ); |
| 26 | } else { | 26 | } else { |
| 27 | __asm__ __volatile__ ( | 27 | __asm__ __volatile__ ( |
| @@ -29,13 +29,13 @@ void notrace raw_local_irq_restore(unsigned long flags) | |||
| 29 | "and %0, %1, %0\n\t" | 29 | "and %0, %1, %0\n\t" |
| 30 | "putcon %0, " __SR "\n\t" | 30 | "putcon %0, " __SR "\n\t" |
| 31 | : "=&r" (__dummy) | 31 | : "=&r" (__dummy) |
| 32 | : "r" (~RAW_IRQ_DISABLED) | 32 | : "r" (~ARCH_IRQ_DISABLED) |
| 33 | ); | 33 | ); |
| 34 | } | 34 | } |
| 35 | } | 35 | } |
| 36 | EXPORT_SYMBOL(raw_local_irq_restore); | 36 | EXPORT_SYMBOL(arch_local_irq_restore); |
| 37 | 37 | ||
| 38 | unsigned long notrace __raw_local_save_flags(void) | 38 | unsigned long notrace arch_local_save_flags(void) |
| 39 | { | 39 | { |
| 40 | unsigned long flags; | 40 | unsigned long flags; |
| 41 | 41 | ||
| @@ -43,9 +43,9 @@ unsigned long notrace __raw_local_save_flags(void) | |||
| 43 | "getcon " __SR ", %0\n\t" | 43 | "getcon " __SR ", %0\n\t" |
| 44 | "and %0, %1, %0" | 44 | "and %0, %1, %0" |
| 45 | : "=&r" (flags) | 45 | : "=&r" (flags) |
| 46 | : "r" (RAW_IRQ_DISABLED) | 46 | : "r" (ARCH_IRQ_DISABLED) |
| 47 | ); | 47 | ); |
| 48 | 48 | ||
| 49 | return flags; | 49 | return flags; |
| 50 | } | 50 | } |
| 51 | EXPORT_SYMBOL(__raw_local_save_flags); | 51 | EXPORT_SYMBOL(arch_local_save_flags); |
