commit 7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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

Linus Torvalds 20 years ago 7cfa132c 6d22d85a

+2 -1

2 changed files

expand all

unified split

arch

arm

mach-sa1100

jornada720.c

oprofile

backtrace.c

arch/arm/mach-sa1100/jornada720.c

··· 97 97 } 98 98 99 99 MACHINE_START(JORNADA720, "HP Jornada 720") 100 + /* Maintainer: Michael Gernoth <michael@gernoth.net> */ 100 101 .phys_ram = 0xc0000000, 101 102 .phys_io = 0x80000000, 102 103 .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,

+1 -1

arch/arm/oprofile/backtrace.c

··· 115 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 120 struct frame_tail *tail; 121 121 unsigned long last_address = 0;