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

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

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "A number of smallish fixes scattered around the ARM code.  Probably
  the most serious one is the one from Al addressing the missing locking
  in the swap emulation code."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards
  ARM: 7606/1: cache: flush to LoUU instead of LoUIS on uniprocessor CPUs
  ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
  ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata
  ARM: 7602/1: Pass real "__machine_arch_type" variable to setup_machine_tags() procedure
  ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S
parents f3dc1294 e6ee4b2b

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


#else



#include <mach/debug-macro.S>

#include CONFIG_DEBUG_LL_INCLUDE



		.macro	writeb,	ch, rb

		senduart \ch, \rb

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ void __init setup_arch(char **cmdline_p) 
	setup_processor();

	mdesc = setup_machine_fdt(__atags_pointer);

	if (!mdesc)

		mdesc = setup_machine_tags(__atags_pointer, machine_arch_type);

		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);

	machine_desc = mdesc;

	machine_name = mdesc->name;

arch/arm/kernel/swp_emulate.c

+2 −0
Original line number Diff line number Diff line
@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr) 
{

	siginfo_t info;



	down_read(&current->mm->mmap_sem);

	if (find_vma(current->mm, addr) == NULL)

		info.si_code = SEGV_MAPERR;

	else

		info.si_code = SEGV_ACCERR;

	up_read(&current->mm->mmap_sem);



	info.si_signo = SIGSEGV;

	info.si_errno = 0;

arch/arm/kernel/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ SECTIONS 
	}

#endif



	NOTES



	_etext = .;			/* End of text and rodata section */



#ifndef CONFIG_XIP_KERNEL
@@ -295,8 +297,6 @@ SECTIONS 
	}

#endif



	NOTES



	BSS_SECTION(0, 0, 0)

	_end = .;

arch/arm/mach-realview/include/mach/board-eb.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define REALVIEW_EB_USB_BASE		0x4F000000	/* USB */



#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB

#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x1F000000

#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x10100000

#define REALVIEW_EB11MP_L220_BASE	0x10102000	/* L220 registers */

#define REALVIEW_EB11MP_SYS_PLD_CTRL1	0xD8		/* Register offset for MPCore sysctl */

#else