diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 20:02:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 20:02:31 (GMT) |
| commit | 7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 (patch) | |
| tree | 61a24fcb1333cfedf540978048fef13f36653948 | |
| parent | 6d22d85a852b72398a81b8e476977b28b4400f7c (diff) | |
| parent | c80f90ba15ed56ae36d1fb51f81a88f9ba0d8c8b (diff) | |
| download | linux-fsl-qoriq-7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 1 | ||||
| -rw-r--r-- | arch/arm/oprofile/backtrace.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index eee3cbc..2f49711 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -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, diff --git a/arch/arm/oprofile/backtrace.c b/arch/arm/oprofile/backtrace.c index ec58d3e..df35c45 100644 --- a/arch/arm/oprofile/backtrace.c +++ b/arch/arm/oprofile/backtrace.c @@ -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; |