kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 318-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch
1 From 653dcc09407a695efb203337c6f72515d4c4ee43 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 29/53] 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 | 6 +++---
12 1 file changed, 3 insertions(+), 3 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 bcm63xx_init_irq(void)
26 }
27
28 if (irq_bits == 32) {
29 - dispatch_internal = __dispatch_internal;
30 + dispatch_internal = __dispatch_internal_32;
31 internal_irq_mask = __internal_irq_mask_32;
32 internal_irq_unmask = __internal_irq_unmask_32;
33 } else {
34 @@ -149,7 +149,7 @@ static inline void handle_internal(int i
35 * will resume the loop where it ended the last time we left this
36 * function.
37 */
38 -static void __dispatch_internal(void)
39 +static void __dispatch_internal_32(void)
40 {
41 u32 pending;
42 static int i;