Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 31b37c73c56b4129ff22436af97b77719a4db852

Authored by Paul Mundt
1 parent 071a1e33ba
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff

arch/sh/kernel/irq_64.c
Diff comments   View file @ 31b37c7
... ... @@ -11,17 +11,17 @@
11 11 #include <linux/module.h>
12 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 16 unsigned long long __dummy;
17 17  
18   - if (flags == RAW_IRQ_DISABLED) {
  18 + if (flags == ARCH_IRQ_DISABLED) {
19 19 __asm__ __volatile__ (
20 20 "getcon " __SR ", %0\n\t"
21 21 "or %0, %1, %0\n\t"
22 22 "putcon %0, " __SR "\n\t"
23 23 : "=&r" (__dummy)
24   - : "r" (RAW_IRQ_DISABLED)
  24 + : "r" (ARCH_IRQ_DISABLED)
25 25 );
26 26 } else {
27 27 __asm__ __volatile__ (
28 28  
29 29  
... ... @@ -29,13 +29,13 @@
29 29 "and %0, %1, %0\n\t"
30 30 "putcon %0, " __SR "\n\t"
31 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 40 unsigned long flags;
41 41  
42 42  
... ... @@ -43,10 +43,10 @@
43 43 "getcon " __SR ", %0\n\t"
44 44 "and %0, %1, %0"
45 45 : "=&r" (flags)
46   - : "r" (RAW_IRQ_DISABLED)
  46 + : "r" (ARCH_IRQ_DISABLED)
47 47 );
48 48  
49 49 return flags;
50 50 }
51   -EXPORT_SYMBOL(__raw_local_save_flags);
  51 +EXPORT_SYMBOL(arch_local_save_flags);