kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 337-MIPS-BCM63XX-widen-cpuid-field.patch
1 From f1477f6e3551fd6beecfee5368fed1325dcd421f Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Sat, 7 Dec 2013 14:54:51 +0100
4 Subject: [PATCH 47/53] MIPS: BCM63XX: widen cpuid field
5
6 ---
7 arch/mips/bcm63xx/cpu.c | 2 +-
8 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 8 ++++----
9 2 files changed, 5 insertions(+), 5 deletions(-)
10
11 --- a/arch/mips/bcm63xx/cpu.c
12 +++ b/arch/mips/bcm63xx/cpu.c
13 @@ -24,7 +24,7 @@ EXPORT_SYMBOL(bcm63xx_regs_base);
14 const int *bcm63xx_irqs;
15 EXPORT_SYMBOL(bcm63xx_irqs);
16
17 -u16 bcm63xx_cpu_id __read_mostly;
18 +u32 bcm63xx_cpu_id __read_mostly;
19 EXPORT_SYMBOL(bcm63xx_cpu_id);
20
21 static u32 bcm63xx_cpu_variant __read_mostly;
22 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
23 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
24 @@ -27,7 +27,7 @@ u32 bcm63xx_get_cpu_variant(void);
25 u8 bcm63xx_get_cpu_rev(void);
26 unsigned int bcm63xx_get_cpu_freq(void);
27
28 -static inline u16 __pure __bcm63xx_get_cpu_id(const u16 cpu_id)
29 +static inline u32 __pure __bcm63xx_get_cpu_id(const u32 cpu_id)
30 {
31 switch (cpu_id) {
32 #ifdef CONFIG_BCM63XX_CPU_3368
33 @@ -69,11 +69,11 @@ static inline u16 __pure __bcm63xx_get_c
34 return cpu_id;
35 }
36
37 -extern u16 bcm63xx_cpu_id;
38 +extern u32 bcm63xx_cpu_id;
39
40 -static inline u16 __pure bcm63xx_get_cpu_id(void)
41 +static inline u32 __pure bcm63xx_get_cpu_id(void)
42 {
43 - const u16 cpu_id = bcm63xx_cpu_id;
44 + const u32 cpu_id = bcm63xx_cpu_id;
45
46 return __bcm63xx_get_cpu_id(cpu_id);
47 }