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

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
"Another round of MIPS fixes for 4.5:

- Fix JZ4780 build with DEBUG_ZBOOT and MACH_JZ4780
- Fix build with DEBUG_ZBOOT and MACH_JZ4780
- Fix issue with uninitialised temp_foreign_map
- Fix awk regex compile failure with certain versions of awk. At
this time, the sole user, ld-ifversion, is only used on MIPS"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: smp.c: Fix uninitialised temp_foreign_map
MIPS: Fix build error when SMP is used without GIC
ld-version: Fix awk regex compile failure
MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4780

Linus Torvalds a2655549 f414ca64

+7 -5
unified split
+4 -3
arch/mips/Kconfig
··· 2169 select CPU_MIPSR2_IRQ_VI 2170 select CPU_MIPSR2_IRQ_EI 2171 select SYNC_R4K 2172 - select MIPS_GIC_IPI 2173 select MIPS_MT 2174 select SMP 2175 select SMP_UP ··· 2267 config MIPS_CMP 2268 bool "MIPS CMP framework support (DEPRECATED)" 2269 depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 2270 - select MIPS_GIC_IPI 2271 select SMP 2272 select SYNC_R4K 2273 select SYS_SUPPORTS_SMP ··· 2287 select MIPS_CM 2288 select MIPS_CPC 2289 select MIPS_CPS_PM if HOTPLUG_CPU 2290 - select MIPS_GIC_IPI 2291 select SMP 2292 select SYNC_R4K if (CEVT_R4K || CSRC_R4K) 2293 select SYS_SUPPORTS_HOTPLUG_CPU ··· 2306 bool 2307 2308 config MIPS_GIC_IPI 2309 bool 2310 2311 config MIPS_CM
··· 2169 select CPU_MIPSR2_IRQ_VI 2170 select CPU_MIPSR2_IRQ_EI 2171 select SYNC_R4K 2172 + select MIPS_GIC_IPI if MIPS_GIC 2173 select MIPS_MT 2174 select SMP 2175 select SMP_UP ··· 2267 config MIPS_CMP 2268 bool "MIPS CMP framework support (DEPRECATED)" 2269 depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 2270 + select MIPS_GIC_IPI if MIPS_GIC 2271 select SMP 2272 select SYNC_R4K 2273 select SYS_SUPPORTS_SMP ··· 2287 select MIPS_CM 2288 select MIPS_CPC 2289 select MIPS_CPS_PM if HOTPLUG_CPU 2290 + select MIPS_GIC_IPI if MIPS_GIC 2291 select SMP 2292 select SYNC_R4K if (CEVT_R4K || CSRC_R4K) 2293 select SYS_SUPPORTS_HOTPLUG_CPU ··· 2306 bool 2307 2308 config MIPS_GIC_IPI 2309 + depends on MIPS_GIC 2310 bool 2311 2312 config MIPS_CM
+1 -1
arch/mips/boot/compressed/uart-16550.c
··· 17 #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) 18 #endif 19 20 - #ifdef CONFIG_MACH_JZ4740 21 #include <asm/mach-jz4740/base.h> 22 #define PORT(offset) (CKSEG1ADDR(JZ4740_UART0_BASE_ADDR) + (4 * offset)) 23 #endif
··· 17 #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) 18 #endif 19 20 + #if defined(CONFIG_MACH_JZ4740) || defined(CONFIG_MACH_JZ4780) 21 #include <asm/mach-jz4740/base.h> 22 #define PORT(offset) (CKSEG1ADDR(JZ4740_UART0_BASE_ADDR) + (4 * offset)) 23 #endif
+1
arch/mips/kernel/smp.c
··· 121 cpumask_t temp_foreign_map; 122 123 /* Re-calculate the mask */ 124 for_each_online_cpu(i) { 125 core_present = 0; 126 for_each_cpu(k, &temp_foreign_map)
··· 121 cpumask_t temp_foreign_map; 122 123 /* Re-calculate the mask */ 124 + cpumask_clear(&temp_foreign_map); 125 for_each_online_cpu(i) { 126 core_present = 0; 127 for_each_cpu(k, &temp_foreign_map)
+1 -1
scripts/ld-version.sh
··· 1 #!/usr/bin/awk -f 2 # extract linker version number from stdin and turn into single number 3 { 4 - gsub(".*)", ""); 5 gsub(".*version ", ""); 6 gsub("-.*", ""); 7 split($1,a, ".");
··· 1 #!/usr/bin/awk -f 2 # extract linker version number from stdin and turn into single number 3 { 4 + gsub(".*\\)", ""); 5 gsub(".*version ", ""); 6 gsub("-.*", ""); 7 split($1,a, ".");