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

Commit 7420b73d 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:
  NVRAM depends on RTC_DRV_CMOS
  rename platform_driver name "flash" to "sa1100-mtd"
  annotate that [fp, #-4] is the saved lr
  Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock
  ARM: OMAP: fix fault in enter_full_retention()
  ARM: OMAP: Mask interrupts when disabling interrupts, v2
  ARM: OMAP: gptimer min_delta_ns corrected
  ARM: OMAP: Fix hsmmc init, v2
  ARM: OMAP: Fix omap34xx revision detection for ES3.1
  ARM: OMAP: DMA: Fix uninitialized channel flags
  ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling
  ARM: OMAP: Fix McBSP spin_lock deadlock
  [ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches
  [ARM] call undefined instruction exception handler with irqs enabled
  [ARM] msm: fix build errors
  [ARM] etherh: continue fixing build failure
parents 3e1c4005 de869620

arch/arm/kernel/entry-armv.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -650,6 +650,7 @@ ENTRY(fp_enter) 
no_fp:	mov	pc, lr

no_fp:	mov	pc, lr





__und_usr_unknown:

__und_usr_unknown:

	enable_irq

	mov	r0, sp

	mov	r0, sp

	adr	lr, ret_from_exception

	adr	lr, ret_from_exception

	b	do_undefinstr

	b	do_undefinstr

arch/arm/kernel/entry-common.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ ENTRY(mcount) 
	ldmia sp!, {r0-r3, pc}

	ldmia sp!, {r0-r3, pc}





trace:

trace:

	ldr r1, [fp, #-4]

	ldr r1, [fp, #-4]			@ lr of instrumented routine

	mov r0, lr

	mov r0, lr

	sub r0, r0, #MCOUNT_INSN_SIZE

	sub r0, r0, #MCOUNT_INSN_SIZE

	mov lr, pc

	mov lr, pc

arch/arm/kernel/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ unlock: 
/* Handle bad interrupts */

/* Handle bad interrupts */

static struct irq_desc bad_irq_desc = {

static struct irq_desc bad_irq_desc = {

	.handle_irq = handle_bad_irq,

	.handle_irq = handle_bad_irq,

	.lock = SPIN_LOCK_UNLOCKED

	.lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),

};

};





/*

/*

arch/arm/mach-msm/board-halibut.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach/map.h>

#include <asm/mach/flash.h>

#include <asm/mach/flash.h>





#include <mach/irqs.h>

#include <mach/board.h>

#include <mach/board.h>

#include <mach/msm_iomap.h>

#include <mach/msm_iomap.h>

arch/arm/mach-omap1/devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 
		}

		}

		size = OMAP1_MMC_SIZE;

		size = OMAP1_MMC_SIZE;





		omap_mmc_add(i, base, size, irq, mmc_data[i]);

		omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]);

	};

	};

}

}