tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
"These are two fixes that came in this week, one for a regression we
introduced in 3.10 in the GIC interrupt code, and the other one fixes
a typo in newly introduced code"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
irqchip: gic: call gic_cpu_init() as well in CPU_STARTING_FROZEN case
ARM: dts: Correct the base address of pinctrl_3 on Exynos5250

Linus Torvalds f3c15b0a e10e5771

+4 -4
+1 -1
arch/arm/boot/dts/exynos5250-pinctrl.dtsi
··· 763 763 }; 764 764 }; 765 765 766 - pinctrl@03680000 { 766 + pinctrl@03860000 { 767 767 gpz: gpz { 768 768 gpio-controller; 769 769 #gpio-cells = <2>;
+2 -2
arch/arm/boot/dts/exynos5250.dtsi
··· 161 161 interrupts = <0 50 0>; 162 162 }; 163 163 164 - pinctrl_3: pinctrl@03680000 { 164 + pinctrl_3: pinctrl@03860000 { 165 165 compatible = "samsung,exynos5250-pinctrl"; 166 - reg = <0x0368000 0x1000>; 166 + reg = <0x03860000 0x1000>; 167 167 interrupts = <0 47 0>; 168 168 }; 169 169
+1 -1
drivers/irqchip/irq-gic.c
··· 705 705 static int __cpuinit gic_secondary_init(struct notifier_block *nfb, 706 706 unsigned long action, void *hcpu) 707 707 { 708 - if (action == CPU_STARTING) 708 + if (action == CPU_STARTING || action == CPU_STARTING_FROZEN) 709 709 gic_cpu_init(&gic_data[0]); 710 710 return NOTIFY_OK; 711 711 }