The patch titled lockdep: special s390 print_symbol() version has been added to the -mm tree. Its filename is lockdep-special-s390-print_symbol-version.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: lockdep: special s390 print_symbol() version From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Have a special version of print_symbol() for s390 which clears the most significant bit of addr before calling __print_symbol(). This seems to be better than checking/changing each place in the kernel that saves an instruction pointer. Without this the output would look like: hardirqs last enabled at (30907): [<80018c6a>] 0x80018c6a hardirqs last disabled at (30908): [<8001e48c>] 0x8001e48c softirqs last enabled at (30904): [<8001dc96>] 0x8001dc96 softirqs last disabled at (30897): [<8001dc50>] 0x8001dc50 instead of this: hardirqs last enabled at (19421): [<80018c72>] cpu_idle+0x176/0x1c4 hardirqs last disabled at (19422): [<8001e494>] io_no_vtime+0xa/0x1a softirqs last enabled at (19418): [<8001dc9e>] do_softirq+0xa6/0xe8 softirqs last disabled at (19411): [<8001dc58>] do_softirq+0x60/0xe8 Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/kallsyms.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff -puN include/linux/kallsyms.h~lockdep-special-s390-print_symbol-version include/linux/kallsyms.h --- a/include/linux/kallsyms.h~lockdep-special-s390-print_symbol-version +++ a/include/linux/kallsyms.h @@ -57,11 +57,20 @@ do { \ #define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr) #endif +/* need to clear the most significant bit on s390 31bit */ +#if defined(CONFIG_S390) && !defined(CONFIG_64BIT) +#define print_symbol(fmt, addr) \ +do { \ + __check_printsym_format(fmt, ""); \ + __print_symbol(fmt, addr & 0x7fffffff); \ +} while(0) +#else #define print_symbol(fmt, addr) \ do { \ __check_printsym_format(fmt, ""); \ __print_symbol(fmt, addr); \ } while(0) +#endif #ifndef CONFIG_64BIT #define print_ip_sym(ip) \ _ Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are origin.patch git-klibc.patch git-s390.patch zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix.patch s390-move-var-declarations-behind-ifdef.patch fix-oddball-boolean-logic-in-s390-netiucv.patch s390-broken-null-test-in-claw-driver.patch lockdep-console_init-after-local_irq_enable.patch lockdep-add-print_ip_sym.patch lockdep-s390-config_frame_pointer-support.patch lockdep-stacktrace-subsystem-s390-support.patch lockdep-irqtrace-subsystem-s390-support.patch lockdep-s390-turn-validator-off-in-machine-check-handler.patch lockdep-annotate-qeth-driver.patch lockdep-special-s390-print_symbol-version.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html