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

Commit 6cfa9238 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:
 "Fixes for a number of small glitches in various corners of the MIPS
  tree.  No particular areas is standing out.

  With this applied all MIPS defconfigs are building fine.  No merge
  conflicts are expected."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Delete definition of SA_RESTORER.
  MIPS: Fix ISA level which causes secondary cache init bypassing and more
  MIPS: Fix build error cavium-octeon without CONFIG_SMP
  MIPS: Kconfig: Rename SNIPROM too
  MIPS: Alchemy: Fix typo "CONFIG_DEBUG_PCI"
  MIPS: Unbreak function tracer for 64-bit kernel.
parents 00fa6fe9 80fa8181

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ config SNI_RM 
	bool "SNI RM200/300/400"

	select FW_ARC if CPU_LITTLE_ENDIAN

	select FW_ARC32 if CPU_LITTLE_ENDIAN

	select SNIPROM if CPU_BIG_ENDIAN

	select FW_SNIPROM if CPU_BIG_ENDIAN

	select ARCH_MAY_HAVE_PC_FDC

	select BOOT_ELF32

	select CEVT_R4K
@@ -1144,7 +1144,7 @@ config DEFAULT_SGI_PARTITION 
config FW_ARC32

	bool



config SNIPROM

config FW_SNIPROM

	bool



config BOOT_ELF32

arch/mips/cavium-octeon/setup.c

+4 −1
Original line number Diff line number Diff line
@@ -174,7 +174,10 @@ static int octeon_kexec_prepare(struct kimage *image) 


static void octeon_generic_shutdown(void)

{

	int cpu, i;

	int i;

#ifdef CONFIG_SMP

	int cpu;

#endif

	struct cvmx_bootmem_desc *bootmem_desc;

	void *named_block_array_ptr;

arch/mips/include/uapi/asm/signal.h

+6 −2
Original line number Diff line number Diff line
@@ -72,6 +72,12 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ 
 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 *

 * SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever

 * supported its use and no libc was using it, so the entire sa-restorer

 * functionality was removed with lmo commit 39bffc12c3580ab for 2.5.48

 * retaining only the SA_RESTORER definition as a reminder to avoid

 * accidental reuse of the mask bit.

 */

#define SA_ONSTACK	0x08000000

#define SA_RESETHAND	0x80000000
@@ -84,8 +90,6 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ 
#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND



#define SA_RESTORER	0x04000000	/* Only for o32 */



#define MINSIGSTKSZ    2048

#define SIGSTKSZ       8192

arch/mips/kernel/cpu-probe.c

+2 −4
Original line number Diff line number Diff line
@@ -1227,10 +1227,8 @@ __cpuinit void cpu_probe(void) 
	if (c->options & MIPS_CPU_FPU) {

		c->fpu_id = cpu_get_fpu_id();



		if (c->isa_level == MIPS_CPU_ISA_M32R1 ||

		    c->isa_level == MIPS_CPU_ISA_M32R2 ||

		    c->isa_level == MIPS_CPU_ISA_M64R1 ||

		    c->isa_level == MIPS_CPU_ISA_M64R2) {

		if (c->isa_level & (MIPS_CPU_ISA_M32R1 | MIPS_CPU_ISA_M32R2 |

				    MIPS_CPU_ISA_M64R1 | MIPS_CPU_ISA_M64R2)) {

			if (c->fpu_id & MIPS_FPIR_3D)

				c->ases |= MIPS_ASE_MIPS3D;

		}

arch/mips/kernel/mcount.S

+7 −4
Original line number Diff line number Diff line
@@ -46,9 +46,8 @@ 
	PTR_L	a5, PT_R9(sp)

	PTR_L	a6, PT_R10(sp)

	PTR_L	a7, PT_R11(sp)

#else

	PTR_ADDIU	sp, PT_SIZE

#endif

	PTR_ADDIU	sp, PT_SIZE

	.endm



	.macro RETURN_BACK
@@ -68,7 +67,11 @@ NESTED(ftrace_caller, PT_SIZE, ra) 
	.globl _mcount

_mcount:

	b	ftrace_stub

#ifdef CONFIG_32BIT

	 addiu sp,sp,8

#else

	 nop

#endif



	/* When tracing is activated, it calls ftrace_caller+8 (aka here) */

	lw	t1, function_trace_stop