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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5348/1: fix documentation wrt location of the alignment trap interface
  [ARM] Ensure linux/hardirqs.h is included where required
  [ARM] fix kernel-doc syntax
  [ARM] arch/arm/common/sa1111.c: Correct error handling code
  [ARM] 5341/2: there is no copy_page on nommu ARM
parents 7004405c 1ada1441

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

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

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>

arch/arm/mach-pxa/include/mach/reset.h

+2 −3
Original line number Diff line number Diff line
@@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask); 


/**

 * init_gpio_reset() - register GPIO as reset generator

 *

 * @gpio - gpio nr

 * @output - set gpio as out/low instead of input during normal work

 * @gpio: gpio nr

 * @output: set gpio as out/low instead of input during normal work

 */

extern int init_gpio_reset(int gpio, int output);