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

Commit 7cfa132c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 6d22d85a c80f90ba

arch/arm/mach-sa1100/jornada720.c

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ static void __init jornada720_map_io(void) 
}



MACHINE_START(JORNADA720, "HP Jornada 720")

	/* Maintainer: Michael Gernoth <michael@gernoth.net> */

	.phys_ram	= 0xc0000000,

	.phys_io	= 0x80000000,

	.io_pg_offst	= ((0xf8000000) >> 18) & 0xfffc,

arch/arm/oprofile/backtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int valid_kernel_stack(struct frame_tail *tail, struct pt_regs *regs) 
	return (tailaddr > stack) && (tailaddr < stack_base);

}



void arm_backtrace(struct pt_regs const *regs, unsigned int depth)

void arm_backtrace(struct pt_regs * const regs, unsigned int depth)

{

	struct frame_tail *tail;

	unsigned long last_address = 0;