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

Commit 7243f214 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core 

Conflicts:
	arch/parisc/kernel/irq.c
parents b478b782 62395efd 5bee17f1

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -3356,10 +3356,8 @@ S: Maintained 
PARISC ARCHITECTURE

P:	Kyle McMartin

M:	kyle@mcmartin.ca

P:	Matthew Wilcox

M:	matthew@wil.cx

P:	Grant Grundler

M:	grundler@parisc-linux.org

P:	Helge Deller

M:	deller@gmx.de

L:	linux-parisc@vger.kernel.org

W:	http://www.parisc-linux.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git

arch/arm/kernel/entry-common.S

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

mcount_call:

	bl ftrace_stub

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

	ldmia sp!, {r0-r3, pc}



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

ftrace_call:

	bl ftrace_stub

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

	ldmia sp!, {r0-r3, pc}



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

	cmp r0, r2

	bne trace

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

	ldmia sp!, {r0-r3, pc}



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

	mov lr, pc

	mov pc, r2

	mov lr, r1				@ restore lr

	ldmia sp!, {r0-r3, pc}



#endif /* CONFIG_DYNAMIC_FTRACE */

arch/arm/kernel/fiq.c

+2 −2
Original line number 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

 * 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;

	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));

}



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

void __naked get_fiq_regs(struct pt_regs *regs)

{

	register unsigned long tmp;

	asm volatile (

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

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


#ifndef __ASSEMBLY__



struct i2c_board_info;



struct ep93xx_eth_data

{

	unsigned char	dev_addr[6];

arch/arm/mach-mx1/devices.c

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

#include <linux/platform_device.h>

#include <linux/gpio.h>



#include <mach/irqs.h>

#include <mach/hardware.h>



static struct resource imx_csi_resources[] = {