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

Commit 547af560 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Enable ISA_DMA_API config to fix build failure
  MIPS: 32-bit: Fix build failure in asm/fcntl.h
  MIPS: Remove all generated vmlinuz* files on "make clean"
  MIPS: do_sigaltstack() expects userland pointers
  MIPS: Fix error values in case of bad_stack
  MIPS: Sanitize restart logics
  MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
  MIPS: Don't block signals if we'd failed to setup a sigframe
parents b0579fc0 a35bee8a

arch/mips/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -881,11 +881,15 @@ config NO_IOPORT 
config GENERIC_ISA_DMA

	bool

	select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n

	select ISA_DMA_API



config GENERIC_ISA_DMA_SUPPORT_BROKEN

	bool

	select GENERIC_ISA_DMA



config ISA_DMA_API

	bool



config GENERIC_GPIO

	bool

arch/mips/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -105,4 +105,4 @@ OBJCOPYFLAGS_vmlinuz.srec := $(OBJCOPYFLAGS) -S -O srec 
vmlinuz.srec: vmlinuz

	$(call cmd,objcopy)



clean-files := $(objtree)/vmlinuz.*
 
clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}

arch/mips/include/asm/fcntl.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
 */



#ifdef CONFIG_32BIT

#include <linux/types.h>



struct flock {

	short	l_type;

arch/mips/kernel/branch.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ int __compute_return_epc(struct pt_regs *regs) 
		return -EFAULT;

	}



	regs->regs[0] = 0;

	switch (insn.i_format.opcode) {

	/*

	 * jr and jalr are in r_format format.

arch/mips/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) 
{

	/* do the secure computing check first */

	if (!entryexit)

		secure_computing(regs->regs[0]);

		secure_computing(regs->regs[2]);



	if (unlikely(current->audit_context) && entryexit)

		audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]),
@@ -565,7 +565,7 @@ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) 


out:

	if (unlikely(current->audit_context) && !entryexit)

		audit_syscall_entry(audit_arch(), regs->regs[0],

		audit_syscall_entry(audit_arch(), regs->regs[2],

				    regs->regs[4], regs->regs[5],

				    regs->regs[6], regs->regs[7]);

}