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

Commit 1f3f424a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into cpus4096

parents c8cae544 1bda7128

Documentation/arm/mem_alignment

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user 
space, and might cause programs to fail unexpectedly.



To change the alignment trap behavior, simply echo a number into

/proc/sys/debug/alignment.  The number is made up from various bits:

/proc/cpu/alignment.  The number is made up from various bits:



bit		behavior when set

---		-----------------

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/ 
S:	Maintained



ECRYPT FILE SYSTEM

P:	Mike Halcrow, Phillip Hellewell

M:	mhalcrow@us.ibm.com, phillip@hellewell.homeip.net

L:	ecryptfs-devel@lists.sourceforge.net

W:	http://ecryptfs.sourceforge.net/

P:	Tyler Hicks, Dustin Kirkland

M:	tyhicks@linux.vnet.ibm.com, kirkland@canonical.com

L:	ecryptfs-devel@lists.launchpad.net

W:	https://launchpad.net/ecryptfs

S:	Supported



EDAC-CORE

arch/arm/common/sa1111.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 
		return -ENOMEM;



	sachip->clk = clk_get(me, "SA1111_CLK");

	if (!sachip->clk) {

	if (IS_ERR(sachip->clk)) {

		ret = PTR_ERR(sachip->clk);

		goto err_free;

	}

arch/arm/kernel/armksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user); 
EXPORT_SYMBOL(__strncpy_from_user);



#ifdef CONFIG_MMU

EXPORT_SYMBOL(copy_page);



EXPORT_SYMBOL(__copy_from_user);

EXPORT_SYMBOL(__copy_to_user);

EXPORT_SYMBOL(__clear_user);
@@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be); 
EXPORT_SYMBOL(_find_next_bit_be);

#endif



EXPORT_SYMBOL(copy_page);



#ifdef CONFIG_FUNCTION_TRACER

EXPORT_SYMBOL(mcount);

#endif

arch/arm/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/personality.h>

#include <linux/kallsyms.h>

#include <linux/delay.h>

#include <linux/hardirq.h>

#include <linux/init.h>

#include <linux/uaccess.h>