kernel: update 3.10 to 3.10.13
[openwrt.git] / target / linux / brcm63xx / patches-3.10 / 313-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch
1 From 3bc62bd6e8c8a37d64cb797d24955711e98de15c Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Thu, 21 Mar 2013 17:05:15 +0100
4 Subject: [PATCH 05/14] MIPS: BCM63XX: rename __dispatch_internal to
5  __dispatch_internal_32
6
7 Make it follow the same naming convention as the other functions.
8
9 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
10 ---
11  arch/mips/bcm63xx/irq.c |    8 ++++----
12  1 file changed, 4 insertions(+), 4 deletions(-)
13
14 --- a/arch/mips/bcm63xx/irq.c
15 +++ b/arch/mips/bcm63xx/irq.c
16 @@ -19,7 +19,7 @@
17  #include <bcm63xx_io.h>
18  #include <bcm63xx_irq.h>
19  
20 -static void __dispatch_internal(void) __maybe_unused;
21 +static void __dispatch_internal_32(void) __maybe_unused;
22  static void __dispatch_internal_64(void) __maybe_unused;
23  static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;
24  static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;
25 @@ -117,7 +117,7 @@ static void __internal_irq_unmask_64(uns
26  #endif
27  
28  #if irq_bits == 32
29 -#define dispatch_internal                      __dispatch_internal
30 +#define dispatch_internal                      __dispatch_internal_32
31  #define internal_irq_mask                      __internal_irq_mask_32
32  #define internal_irq_unmask                    __internal_irq_unmask_32
33  #else
34 @@ -225,7 +225,7 @@ static void bcm63xx_init_irq(void)
35         }
36  
37         if (irq_bits == 32) {
38 -               dispatch_internal = __dispatch_internal;
39 +               dispatch_internal = __dispatch_internal_32;
40                 internal_irq_mask = __internal_irq_mask_32;
41                 internal_irq_unmask = __internal_irq_unmask_32;
42         } else {
43 @@ -258,7 +258,7 @@ static inline void handle_internal(int i
44   * will resume the loop where it ended the last time we left this
45   * function.
46   */
47 -static void __dispatch_internal(void)
48 +static void __dispatch_internal_32(void)
49  {
50         u32 pending;
51         static int i;