Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2655549 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f414ca64 d825c06b

arch/mips/Kconfig

+4 −3
Original line number Original line Diff line number Diff line
@@ -2169,7 +2169,7 @@ config MIPS_MT_SMP 
	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CPU_MIPSR2_IRQ_EI

	select SYNC_R4K

	select SYNC_R4K

	select MIPS_GIC_IPI

	select MIPS_GIC_IPI if MIPS_GIC

	select MIPS_MT

	select MIPS_MT

	select SMP

	select SMP

	select SMP_UP

	select SMP_UP
@@ -2267,7 +2267,7 @@ config MIPS_VPE_APSP_API_MT 
config MIPS_CMP

config MIPS_CMP

	bool "MIPS CMP framework support (DEPRECATED)"

	bool "MIPS CMP framework support (DEPRECATED)"

	depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6

	depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6

	select MIPS_GIC_IPI

	select MIPS_GIC_IPI if MIPS_GIC

	select SMP

	select SMP

	select SYNC_R4K

	select SYNC_R4K

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_SMP
@@ -2287,7 +2287,7 @@ config MIPS_CPS 
	select MIPS_CM

	select MIPS_CM

	select MIPS_CPC

	select MIPS_CPC

	select MIPS_CPS_PM if HOTPLUG_CPU

	select MIPS_CPS_PM if HOTPLUG_CPU

	select MIPS_GIC_IPI

	select MIPS_GIC_IPI if MIPS_GIC

	select SMP

	select SMP

	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)

	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_SUPPORTS_HOTPLUG_CPU
@@ -2306,6 +2306,7 @@ config MIPS_CPS_PM 
	bool

	bool





config MIPS_GIC_IPI

config MIPS_GIC_IPI

	depends on MIPS_GIC

	bool

	bool





config MIPS_CM

config MIPS_CM

arch/mips/boot/compressed/uart-16550.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset))

#define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset))

#endif

#endif





#ifdef CONFIG_MACH_JZ4740

#if defined(CONFIG_MACH_JZ4740) || defined(CONFIG_MACH_JZ4780)

#include <asm/mach-jz4740/base.h>

#include <asm/mach-jz4740/base.h>

#define PORT(offset) (CKSEG1ADDR(JZ4740_UART0_BASE_ADDR) + (4 * offset))

#define PORT(offset) (CKSEG1ADDR(JZ4740_UART0_BASE_ADDR) + (4 * offset))

#endif

#endif

arch/mips/kernel/smp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,7 @@ static inline void calculate_cpu_foreign_map(void) 
	cpumask_t temp_foreign_map;

	cpumask_t temp_foreign_map;





	/* Re-calculate the mask */

	/* Re-calculate the mask */

	cpumask_clear(&temp_foreign_map);

	for_each_online_cpu(i) {

	for_each_online_cpu(i) {

		core_present = 0;

		core_present = 0;

		for_each_cpu(k, &temp_foreign_map)

		for_each_cpu(k, &temp_foreign_map)

scripts/ld-version.sh

+1 −1
Original line number Original line Diff line number Diff line 
#!/usr/bin/awk -f

#!/usr/bin/awk -f

# extract linker version number from stdin and turn into single number

# extract linker version number from stdin and turn into single number

	{

	{

	gsub(".*)", "");

	gsub(".*\\)", "");

	gsub(".*version ", "");

	gsub(".*version ", "");

	gsub("-.*", "");

	gsub("-.*", "");

	split($1,a, ".");

	split($1,a, ".");