Commit 831e45d8 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:
 "A round of 4.8 fixes:

  MIPS generic code:
   - Add a missing ".set pop" in an early commit
   - Fix memory regions reaching top of physical
   - MAAR: Fix address alignment
   - vDSO: Fix Malta EVA mapping to vDSO page structs
   - uprobes: fix incorrect uprobe brk handling
   - uprobes: select HAVE_REGS_AND_STACK_ACCESS_API
   - Avoid a BUG warning during PR_SET_FP_MODE prctl
   - SMP: Fix possibility of deadlock when bringing CPUs online
   - R6: Remove compact branch policy Kconfig entries
   - Fix size calc when avoiding IPIs for small icache flushes
   - Fix pre-r6 emulation FPU initialisation
   - Fix delay slot emulation count in debugfs

  ATH79:
   - Fix test for error return of clk_register_fixed_factor.

  Octeon:
   - Fix kernel header to work for VDSO build.
   - Fix initialization of platform device probing.

  paravirt:
   - Fix undefined reference to smp_bootstrap"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix delay slot emulation count in debugfs
  MIPS: SMP: Fix possibility of deadlock when bringing CPUs online
  MIPS: Fix pre-r6 emulation FPU initialisation
  MIPS: vDSO: Fix Malta EVA mapping to vDSO page structs
  MIPS: Select HAVE_REGS_AND_STACK_ACCESS_API
  MIPS: Octeon: Fix platform bus probing
  MIPS: Octeon: mangle-port: fix build failure with VDSO code
  MIPS: Avoid a BUG warning during prctl(PR_SET_FP_MODE, ...)
  MIPS: c-r4k: Fix size calc when avoiding IPIs for small icache flushes
  MIPS: Add a missing ".set pop" in an early commit
  MIPS: paravirt: Fix undefined reference to smp_bootstrap
  MIPS: Remove compact branch policy Kconfig entries
  MIPS: MAAR: Fix address alignment
  MIPS: Fix memory regions reaching top of physical
  MIPS: uprobes: fix incorrect uprobe brk handling
  MIPS: ath79: Fix test for error return of clk_register_fixed_factor().
parents 751b9a5d 116e7111

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ config MIPS 
	select ARCH_CLOCKSOURCE_DATA

	select HANDLE_DOMAIN_IRQ

	select HAVE_EXIT_THREAD

	select HAVE_REGS_AND_STACK_ACCESS_API



menu "Machine selection"

arch/mips/Kconfig.debug

+0 −36
Original line number Diff line number Diff line
@@ -113,42 +113,6 @@ config SPINLOCK_TEST 
	help

	  Add several files to the debugfs to test spinlock speed.



if CPU_MIPSR6



choice

	prompt "Compact branch policy"

	default MIPS_COMPACT_BRANCHES_OPTIMAL



config MIPS_COMPACT_BRANCHES_NEVER

	bool "Never (force delay slot branches)"

	help

	  Pass the -mcompact-branches=never flag to the compiler in order to

	  force it to always emit branches with delay slots, and make no use

	  of the compact branch instructions introduced by MIPSr6. This is

	  useful if you suspect there may be an issue with compact branches in

	  either the compiler or the CPU.



config MIPS_COMPACT_BRANCHES_OPTIMAL

	bool "Optimal (use where beneficial)"

	help

	  Pass the -mcompact-branches=optimal flag to the compiler in order for

	  it to make use of compact branch instructions where it deems them

	  beneficial, and use branches with delay slots elsewhere. This is the

	  default compiler behaviour, and should be used unless you have a

	  reason to choose otherwise.



config MIPS_COMPACT_BRANCHES_ALWAYS

	bool "Always (force compact branches)"

	help

	  Pass the -mcompact-branches=always flag to the compiler in order to

	  force it to always emit compact branches, making no use of branch

	  instructions with delay slots. This can result in more compact code

	  which may be beneficial in some scenarios.



endchoice



endif # CPU_MIPSR6



config SCACHE_DEBUGFS

	bool "L2 cache debugfs entries"

	depends on DEBUG_FS

arch/mips/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -203,10 +203,6 @@ endif 
toolchain-virt				:= $(call cc-option-yn,$(mips-cflags) -mvirt)

cflags-$(toolchain-virt)		+= -DTOOLCHAIN_SUPPORTS_VIRT



cflags-$(CONFIG_MIPS_COMPACT_BRANCHES_NEVER)	+= -mcompact-branches=never

cflags-$(CONFIG_MIPS_COMPACT_BRANCHES_OPTIMAL)	+= -mcompact-branches=optimal

cflags-$(CONFIG_MIPS_COMPACT_BRANCHES_ALWAYS)	+= -mcompact-branches=always



#

# Firmware support

#

arch/mips/ath79/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct clk * __init ath79_reg_ffclk(const char *name, 
	struct clk *clk;



	clk = clk_register_fixed_factor(NULL, name, parent_name, 0, mult, div);

	if (!clk)

	if (IS_ERR(clk))

		panic("failed to allocate %s clock structure", name);



	return clk;

arch/mips/cavium-octeon/octeon-platform.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static int __init octeon_publish_devices(void) 
{

	return of_platform_bus_probe(NULL, octeon_ids, NULL);

}

device_initcall(octeon_publish_devices);

arch_initcall(octeon_publish_devices);



MODULE_AUTHOR("David Daney <ddaney@caviumnetworks.com>");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE