diff options
-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 eee3cbc5ec4f..2f497112c96a 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) | |||
97 | } | 97 | } |
98 | 98 | ||
99 | MACHINE_START(JORNADA720, "HP Jornada 720") | 99 | MACHINE_START(JORNADA720, "HP Jornada 720") |
100 | /* Maintainer: Michael Gernoth <michael@gernoth.net> */ | ||
100 | .phys_ram = 0xc0000000, | 101 | .phys_ram = 0xc0000000, |
101 | .phys_io = 0x80000000, | 102 | .phys_io = 0x80000000, |
102 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, | 103 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
diff --git a/arch/arm/oprofile/backtrace.c b/arch/arm/oprofile/backtrace.c index ec58d3e2eb8b..df35c452a8bf 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) | |||
115 | return (tailaddr > stack) && (tailaddr < stack_base); | 115 | return (tailaddr > stack) && (tailaddr < stack_base); |
116 | } | 116 | } |
117 | 117 | ||
118 | void arm_backtrace(struct pt_regs const *regs, unsigned int depth) | 118 | void arm_backtrace(struct pt_regs * const regs, unsigned int depth) |
119 | { | 119 | { |
120 | struct frame_tail *tail; | 120 | struct frame_tail *tail; |
121 | unsigned long last_address = 0; | 121 | unsigned long last_address = 0; |