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

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

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: wire up process_vm_writev and process_vm_readv syscalls
  ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list
  ARM: 7158/1: add new MFP implement for NUC900
  ARM: 7157/1: fix a building WARNING for nuc900
  ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OF
  ARM: 7155/1: arch.h: Declare 'pt_regs' locally
  ARM: 7154/1: mach-bcmring: fix build error in dma.c
  ARM: 7153/1: mach-bcmring: fix build error in core.c
  ARM: 7152/1: distclean: Remove generated .dtb files
  ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ processors
  ARM: 7149/1: spi/pl022: Enable clock in probe
  Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage"
parents 2d360fcb e5489847

arch/arm/boot/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ $(obj)/%.dtb: $(src)/dts/%.dts 


$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))



clean-files := *.dtb



quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \

		   -C none -a $(LOADADDR) -e $(STARTADDR) \

arch/arm/include/asm/hardware/cache-l2x0.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#ifndef __ASM_ARM_HARDWARE_L2X0_H

#define __ASM_ARM_HARDWARE_L2X0_H



#include <linux/errno.h>



#define L2X0_CACHE_ID			0x000

#define L2X0_CACHE_TYPE			0x004

#define L2X0_CTRL			0x100

arch/arm/include/asm/mach/arch.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
struct tag;

struct meminfo;

struct sys_timer;

struct pt_regs;



struct machine_desc {

	unsigned int		nr;		/* architecture number	*/

arch/arm/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -402,6 +402,8 @@ 
#define __NR_syncfs			(__NR_SYSCALL_BASE+373)

#define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)

#define __NR_setns			(__NR_SYSCALL_BASE+375)

#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)

#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)



/*

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

+2 −0
Original line number Diff line number Diff line
@@ -385,6 +385,8 @@ 
		CALL(sys_syncfs)

		CALL(sys_sendmmsg)

/* 375 */	CALL(sys_setns)

		CALL(sys_process_vm_readv)

		CALL(sys_process_vm_writev)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted