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

Commit 39dc948c authored by Alex Elder's avatar Alex Elder
Browse files

Merge branch 'v2.6.36'

parents a731cd11 f6f94e2a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3162,7 +3162,7 @@ F: drivers/net/ioc3-eth.c 


IOC3 SERIAL DRIVER

M:	Pat Gefre <pfg@sgi.com>

L:	linux-mips@linux-mips.org

L:	linux-serial@vger.kernel.org

S:	Maintained

F:	drivers/serial/ioc3_serial.c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 36

EXTRAVERSION = -rc8

EXTRAVERSION =

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/m32r/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ typedef elf_fpreg_t elf_fpregset_t; 
 * These are used to set parameters in the core dumps.

 */

#define ELF_CLASS	ELFCLASS32

#if defined(__LITTLE_ENDIAN)

#if defined(__LITTLE_ENDIAN__)

#define ELF_DATA	ELFDATA2LSB

#elif defined(__BIG_ENDIAN)

#elif defined(__BIG_ENDIAN__)

#define ELF_DATA	ELFDATA2MSB

#else

#error no endian defined

arch/m32r/kernel/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
vmlinux.lds

arch/m32r/kernel/signal.c

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 


#define DEBUG_SIG 0



#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



asmlinkage int

sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,

		unsigned long r2, unsigned long r3, unsigned long r4,
@@ -254,7 +256,7 @@ give_sigsegv: 
static int prev_insn(struct pt_regs *regs)

{

	u16 inst;

	if (get_user(&inst, (u16 __user *)(regs->bpc - 2)))

	if (get_user(inst, (u16 __user *)(regs->bpc - 2)))

		return -EFAULT;

	if ((inst & 0xfff0) == 0x10f0)	/* trap ? */

		regs->bpc -= 2;