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

Commit fbd8104c 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: (23 commits)
  [ARM] Fix virtual to physical translation macro corner cases
  [ARM] update mach-types
  [ARM] 5421/1: ftrace: fix crash due to tracing of __naked functions
  MX1 fix include
  [ARM] 5419/1: ep93xx: fix build warnings about struct i2c_board_info
  [ARM] 5418/1: restore lr before leaving mcount
  ARM: OMAP: board-omap3beagle: set i2c-3 to 100kHz
  ARM: OMAP: Allow I2C bus driver to be compiled as a module
  ARM: OMAP: sched_clock() corrected
  ARM: OMAP: Fix compile error if pm.h is included
  [ARM] orion5x: pass dram mbus data to xor driver
  [ARM] S3C64XX: Fix s3c64xx_setrate_clksrc
  [ARM] S3C64XX: sparse warnings in arch/arm/plat-s3c64xx/irq.c
  [ARM] S3C64XX: sparse warnings in arch/arm/plat-s3c64xx/s3c6400-clock.c
  [ARM] S3C64XX: Fix USB host clock mux list
  [ARM] S3C64XX: Fix name of USB host clock.
  [ARM] S3C64XX: Rename IRQ_UHOST to IRQ_USBH
  [ARM] S3C64XX: Do gpiolib configuration earlier
  [ARM] S3C64XX: Staticise s3c64xx_init_irq_eint()
  [ARM] SMDK6410: Declare iodesc table static
  ...
parents 18553c38 1522ac3e

arch/arm/kernel/entry-common.S

+4 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ ENTRY(mcount) 
	.globl mcount_call

	.globl mcount_call

mcount_call:

mcount_call:

	bl ftrace_stub

	bl ftrace_stub

	ldr lr, [fp, #-4]			@ restore lr

	ldmia sp!, {r0-r3, pc}

	ldmia sp!, {r0-r3, pc}





ENTRY(ftrace_caller)

ENTRY(ftrace_caller)
@@ -122,6 +123,7 @@ ENTRY(ftrace_caller) 
	.globl ftrace_call

	.globl ftrace_call

ftrace_call:

ftrace_call:

	bl ftrace_stub

	bl ftrace_stub

	ldr lr, [fp, #-4]			@ restore lr

	ldmia sp!, {r0-r3, pc}

	ldmia sp!, {r0-r3, pc}





#else

#else
@@ -133,6 +135,7 @@ ENTRY(mcount) 
	adr r0, ftrace_stub

	adr r0, ftrace_stub

	cmp r0, r2

	cmp r0, r2

	bne trace

	bne trace

	ldr lr, [fp, #-4]			@ restore lr

	ldmia sp!, {r0-r3, pc}

	ldmia sp!, {r0-r3, pc}





trace:

trace:
@@ -141,6 +144,7 @@ trace: 
	sub r0, r0, #MCOUNT_INSN_SIZE

	sub r0, r0, #MCOUNT_INSN_SIZE

	mov lr, pc

	mov lr, pc

	mov pc, r2

	mov pc, r2

	mov lr, r1				@ restore lr

	ldmia sp!, {r0-r3, pc}

	ldmia sp!, {r0-r3, pc}





#endif /* CONFIG_DYNAMIC_FTRACE */

#endif /* CONFIG_DYNAMIC_FTRACE */

arch/arm/kernel/fiq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ void set_fiq_handler(void *start, unsigned int length) 
 * disable irqs for the duration.  Note - these functions are almost

 * disable irqs for the duration.  Note - these functions are almost

 * entirely coded in assembly.

 * entirely coded in assembly.

 */

 */

void __attribute__((naked)) set_fiq_regs(struct pt_regs *regs)

void __naked set_fiq_regs(struct pt_regs *regs)

{

{

	register unsigned long tmp;

	register unsigned long tmp;

	asm volatile (

	asm volatile (
@@ -106,7 +106,7 @@ void __attribute__((naked)) set_fiq_regs(struct pt_regs *regs) 
	: "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));

	: "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));

}

}





void __attribute__((naked)) get_fiq_regs(struct pt_regs *regs)

void __naked get_fiq_regs(struct pt_regs *regs)

{

{

	register unsigned long tmp;

	register unsigned long tmp;

	asm volatile (

	asm volatile (

arch/arm/mach-ep93xx/include/mach/platform.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,8 @@ 




#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





struct i2c_board_info;



struct ep93xx_eth_data

struct ep93xx_eth_data

{

{

	unsigned char	dev_addr[6];

	unsigned char	dev_addr[6];

arch/arm/mach-mx1/devices.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/gpio.h>



#include <mach/irqs.h>

#include <mach/hardware.h>

#include <mach/hardware.h>





static struct resource imx_csi_resources[] = {

static struct resource imx_csi_resources[] = {

arch/arm/mach-mx1/mx1ads.c

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

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/time.h>





#include <mach/irqs.h>

#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/imx-uart.h>

#include <mach/imx-uart.h>