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

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

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4843/1: Add GCR_CLKBPB for PXA3xx
  [ARM] 4842/1: pxa: remove redundant IRQ saving/restoring in clk_pxa3xx_cken_*
  [ARM] 4841/1: pxa: fix typo in LCD platform data definition code for zylonite
  [ARM] 4840/1: pxa: fix the typo in get_irqnr_and_base
  [ARM] 4839/1: fixes kernel Oops in /dev/mem device driver for memory map with PHYS_OFF
  [ARM] eliminate MODULE_PARM() usage
  [ARM] 4838/1: Fix kexec for SA1100 machines
  [ARM] 4837/1: make __get_unaligned_*() return unsigned types
  [ARM] 4836/1: Make ATAGS_PROC depend on KEXEC
parents c9e71002 d862ccc5

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -939,7 +939,8 @@ config KEXEC 


config ATAGS_PROC

	bool "Export atags in procfs"

	default n

	depends on KEXEC

	default y

	help

	  Should the atags used to boot the kernel be exported in an "atags"

	  file in procfs. Useful with kexec.

arch/arm/mach-pxa/cpu-pxa.c

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


#ifdef DEBUG

static unsigned int freq_debug;

MODULE_PARM(freq_debug, "i");

module_param(freq_debug, uint, 0);

MODULE_PARM_DESC(freq_debug, "Set the debug messages to on=1/off=0");

#else

#define freq_debug  0

arch/arm/mach-pxa/pxa3xx.c

+0 −8
Original line number Diff line number Diff line
@@ -129,28 +129,20 @@ static void clk_pxa3xx_cken_enable(struct clk *clk) 
{

	unsigned long mask = 1ul << (clk->cken & 0x1f);



	local_irq_disable();



	if (clk->cken < 32)

		CKENA |= mask;

	else

		CKENB |= mask;



	local_irq_enable();

}



static void clk_pxa3xx_cken_disable(struct clk *clk)

{

	unsigned long mask = 1ul << (clk->cken & 0x1f);



	local_irq_disable();



	if (clk->cken < 32)

		CKENA &= ~mask;

	else

		CKENB &= ~mask;



	local_irq_enable();

}



static const struct clkops clk_pxa3xx_cken_ops = {

arch/arm/mach-pxa/zylonite.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

};



#if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULES)

#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)

static void zylonite_backlight_power(int on)

{

	gpio_set_value(gpio_backlight, on);

arch/arm/mm/mmap.c

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 
 */

int valid_phys_addr_range(unsigned long addr, size_t size)

{

	if (addr < PHYS_OFFSET)

		return 0;

	if (addr + size > __pa(high_memory))

		return 0;