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

Commit 7e8767dd 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] always allow dump_stack() to produce a backtrace
  [ARM] Fix non-page aligned boot time mappings
  [ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume
  [ARM] 4454/1: Use word accesses in Versatile PCI config reads
parents cab8e5c4 082f47a7

arch/arm/kernel/traps.c

+0 −2
Original line number Diff line number Diff line
@@ -181,9 +181,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) 


void dump_stack(void)

{

#ifdef CONFIG_DEBUG_ERRORS

	__backtrace();

#endif

}



EXPORT_SYMBOL(dump_stack);

arch/arm/mach-pxa/pxa27x.c

+2 −2
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ void pxa_cpu_pm_enter(suspend_state_t state) 
	extern void pxa_cpu_resume(void);



	if (state == PM_SUSPEND_STANDBY)

		CKEN = CKEN_MEMC | CKEN_OSTIMER | CKEN_LCD | CKEN_PWM0;

		CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) | (1 << CKEN_LCD) | (1 << CKEN_PWM0);

	else

		CKEN = CKEN_MEMC | CKEN_OSTIMER;

		CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER);



	/* ensure voltage-change sequencer not initiated, which hangs */

	PCFR &= ~PCFR_FVC;

arch/arm/mach-versatile/pci.c

+4 −1
Original line number Diff line number Diff line
@@ -117,7 +117,10 @@ static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int wh 
	} else {

		switch (size) {

		case 1:

			v = __raw_readb(addr);

			v = __raw_readl(addr);

			if (where & 2) v >>= 16;

			if (where & 1) v >>= 8;

 			v &= 0xff;

			break;



		case 2:

arch/arm/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -527,9 +527,9 @@ void __init create_mapping(struct map_desc *md) 
		return;

	}



	addr = md->virtual;

	addr = md->virtual & PAGE_MASK;

	phys = (unsigned long)__pfn_to_phys(md->pfn);

	length = PAGE_ALIGN(md->length);

	length = PAGE_ALIGN(md->length + (md->virtual & ~PAGE_MASK));



	if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) {

		printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not "

sound/arm/pxa2xx-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) 
 err:

	if (card)

		snd_card_free(card);

	if (CKEN & CKEN_AC97) {

	if (CKEN & (1 << CKEN_AC97)) {

		GCR |= GCR_ACLINK_OFF;

		free_irq(IRQ_AC97, NULL);

		pxa_set_cken(CKEN_AC97, 0);