diff -BruN linux-2.6.24-rc3/arch/ia64/Kconfig linux-2.6.24-rc3-patched/arch/ia64/Kconfig --- linux-2.6.24-rc3/arch/ia64/Kconfig 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/arch/ia64/Kconfig 2007-12-14 16:08:35.000000000 +0800 @@ -99,6 +99,13 @@ bool default y +config LOCKDEP_SUPPORT + bool + default y + +config STACKTRACE_SUPPORT + bool + default y choice prompt "System type" default IA64_GENERIC diff -BruN linux-2.6.24-rc3/arch/ia64/Kconfig.debug linux-2.6.24-rc3-patched/arch/ia64/Kconfig.debug --- linux-2.6.24-rc3/arch/ia64/Kconfig.debug 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/arch/ia64/Kconfig.debug 2007-12-14 16:08:34.000000000 +0800 @@ -2,6 +2,10 @@ source "lib/Kconfig.debug" +config TRACE_IRQFLAGS_SUPPORT + bool + default y + choice prompt "Physical memory granularity" default IA64_GRANULE_64MB diff -BruN linux-2.6.24-rc3/arch/ia64/kernel/ivt.S linux-2.6.24-rc3-patched/arch/ia64/kernel/ivt.S --- linux-2.6.24-rc3/arch/ia64/kernel/ivt.S 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/arch/ia64/kernel/ivt.S 2007-12-14 16:08:35.000000000 +0800 @@ -874,6 +874,9 @@ SAVE_REST ;; MCA_RECOVER_RANGE(interrupt) + ;; + br.call.sptk.many rp=trace_hardirqs_off + ;; alloc r14=ar.pfs,0,0,2,0 // must be first in an insn group mov out0=cr.ivr // pass cr.ivr as first arg add out1=16,sp // pass pointer to pt_regs as second arg diff -BruN linux-2.6.24-rc3/arch/ia64/kernel/Makefile linux-2.6.24-rc3-patched/arch/ia64/kernel/Makefile --- linux-2.6.24-rc3/arch/ia64/kernel/Makefile 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/arch/ia64/kernel/Makefile 2007-12-14 16:08:35.000000000 +0800 @@ -35,6 +35,7 @@ obj-$(CONFIG_PCI_MSI) += msi_ia64.o mca_recovery-y += mca_drv.o mca_drv_asm.o obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o +obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_IA64_ESI) += esi.o ifneq ($(CONFIG_IA64_ESI),) diff -BruN linux-2.6.24-rc3/arch/ia64/kernel/smpboot.c linux-2.6.24-rc3-patched/arch/ia64/kernel/smpboot.c --- linux-2.6.24-rc3/arch/ia64/kernel/smpboot.c 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/arch/ia64/kernel/smpboot.c 2007-12-14 16:08:35.000000000 +0800 @@ -506,7 +506,7 @@ struct create_idle c_idle = { .work = __WORK_INITIALIZER(c_idle.work, do_fork_idle), .cpu = cpu, - .done = COMPLETION_INITIALIZER(c_idle.done), + .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), }; c_idle.idle = get_idle_for_cpu(cpu); diff -BruN linux-2.6.24-rc3/arch/ia64/kernel/stacktrace.c linux-2.6.24-rc3-patched/arch/ia64/kernel/stacktrace.c --- linux-2.6.24-rc3/arch/ia64/kernel/stacktrace.c 1970-01-01 08:00:00.000000000 +0800 +++ linux-2.6.24-rc3-patched/arch/ia64/kernel/stacktrace.c 2007-12-14 16:08:35.000000000 +0800 @@ -0,0 +1,23 @@ +/* + * arch/x86_64/kernel/stacktrace.c + * + * Stack trace management functions + * + * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar + */ +#include +#include +#include +#include + +/* + * Save stack-backtrace addresses into a stack_trace buffer. + */ +void save_stack_trace(struct stack_trace *trace) +{ +} +EXPORT_SYMBOL(save_stack_trace); +void __ia64_save_stack_nonlocal(struct stack_trace *trace) +{ +} +EXPORT_SYMBOL(__ia64_save_stack_nonlocal); diff -BruN linux-2.6.24-rc3/include/asm-ia64/irqflags.h linux-2.6.24-rc3-patched/include/asm-ia64/irqflags.h --- linux-2.6.24-rc3/include/asm-ia64/irqflags.h 1970-01-01 08:00:00.000000000 +0800 +++ linux-2.6.24-rc3-patched/include/asm-ia64/irqflags.h 2007-12-14 16:08:19.000000000 +0800 @@ -0,0 +1,92 @@ +#ifndef _ASM_IRQFLAGS_H +#define _ASM_IRQFLAGS_H +#include +#include +/* + * The group barrier in front of the rsm & ssm are necessary to ensure + * that none of the previous instructions in the same group are + * affected by the rsm/ssm. + */ +/* For spinlocks etc */ + +/* + * - clearing psr.i is implicitly serialized (visible by next insn) + * - setting psr.i requires data serialization + * - we need a stop-bit before reading PSR because we sometimes + * write a floating-point register right before reading the PSR + * and that writes to PSR.mfl + */ +#define __local_irq_save(x) \ +do { \ + ia64_stop(); \ + (x) = ia64_getreg(_IA64_REG_PSR); \ + ia64_stop(); \ + ia64_rsm(IA64_PSR_I); \ +} while (0) + +#define __local_irq_disable() \ +do { \ + ia64_stop(); \ + ia64_rsm(IA64_PSR_I); \ +} while (0) + +#define __local_irq_restore(x) ia64_intrin_local_irq_restore((x) & IA64_PSR_I) + +#ifdef CONFIG_IA64_DEBUG_IRQ + + extern unsigned long last_cli_ip; + +# define __save_ip() last_cli_ip = ia64_getreg(_IA64_REG_IP) + +# define raw_local_irq_save(x) \ +do { \ + unsigned long psr; \ + \ + __local_irq_save(psr); \ + if (psr & IA64_PSR_I) \ + __save_ip(); \ + (x) = psr; \ +} while (0) + +# define raw_local_irq_disable() do { unsigned long x; raw_local_irq_save(x); } while (0) + +# define raw_local_irq_restore(x) \ +do { \ + unsigned long old_psr, psr = (x); \ + \ + local_save_flags(old_psr); \ + __local_irq_restore(psr); \ + if ((old_psr & IA64_PSR_I) && !(psr & IA64_PSR_I)) \ + __save_ip(); \ +} while (0) + +#else /* !CONFIG_IA64_DEBUG_IRQ */ +# define raw_local_irq_save(x) __local_irq_save(x) +# define raw_local_irq_disable() __local_irq_disable() +# define raw_local_irq_restore(x) __local_irq_restore(x) +#endif /* !CONFIG_IA64_DEBUG_IRQ */ + +#define raw_local_irq_enable() ({ ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); }) +#define raw_local_save_flags(flags) ({ ia64_stop(); (flags) = ia64_getreg(_IA64_REG_PSR); }) + +#define raw_irqs_disabled() \ +({ \ + unsigned long __ia64_id_flags; \ + raw_local_save_flags(__ia64_id_flags); \ + (__ia64_id_flags & IA64_PSR_I) == 0; \ +}) + +#define raw_safe_halt() ia64_pal_halt_light() /* PAL_HALT_LIGHT */ +#define raw_irqs_disabled_flags(flags) \ +({ \ + (int)((flags) & IA64_PSR_I) == 0; \ +}) + +#ifdef CONFIG_TRACE_IRQFLAGS +#define TRACE_IRQS_ON br.call.sptk.many b0=trace_hardirqs_on +#define TRACE_IRQS_OFF br.call.sptk.many b0=trace_hardirqs_off +#else +#define TRACE_IRQS_ON +#define TRACE_IRQS_OFF +#endif +#endif diff -BruN linux-2.6.24-rc3/include/asm-ia64/rwsem.h linux-2.6.24-rc3-patched/include/asm-ia64/rwsem.h --- linux-2.6.24-rc3/include/asm-ia64/rwsem.h 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/include/asm-ia64/rwsem.h 2007-12-14 16:08:19.000000000 +0800 @@ -37,6 +37,9 @@ signed long count; spinlock_t wait_lock; struct list_head wait_list; +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lockdep_map dep_map; +#endif }; #define RWSEM_UNLOCKED_VALUE __IA64_UL_CONST(0x0000000000000000) diff -BruN linux-2.6.24-rc3/include/asm-ia64/stacktrace.h linux-2.6.24-rc3-patched/include/asm-ia64/stacktrace.h --- linux-2.6.24-rc3/include/asm-ia64/stacktrace.h 1970-01-01 08:00:00.000000000 +0800 +++ linux-2.6.24-rc3-patched/include/asm-ia64/stacktrace.h 2007-12-14 16:08:19.000000000 +0800 @@ -0,0 +1,7 @@ +#ifndef _ASM_STACKTRACE_H +#define _ASM_STACKTRACE_H 1 + +/* Generic stack tracer with callbacks */ + + +#endif diff -BruN linux-2.6.24-rc3/include/asm-ia64/system.h linux-2.6.24-rc3-patched/include/asm-ia64/system.h --- linux-2.6.24-rc3/include/asm-ia64/system.h 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/include/asm-ia64/system.h 2007-12-14 16:08:19.000000000 +0800 @@ -106,82 +106,6 @@ */ #define set_mb(var, value) do { (var) = (value); mb(); } while (0) -#define safe_halt() ia64_pal_halt_light() /* PAL_HALT_LIGHT */ - -/* - * The group barrier in front of the rsm & ssm are necessary to ensure - * that none of the previous instructions in the same group are - * affected by the rsm/ssm. - */ -/* For spinlocks etc */ - -/* - * - clearing psr.i is implicitly serialized (visible by next insn) - * - setting psr.i requires data serialization - * - we need a stop-bit before reading PSR because we sometimes - * write a floating-point register right before reading the PSR - * and that writes to PSR.mfl - */ -#define __local_irq_save(x) \ -do { \ - ia64_stop(); \ - (x) = ia64_getreg(_IA64_REG_PSR); \ - ia64_stop(); \ - ia64_rsm(IA64_PSR_I); \ -} while (0) - -#define __local_irq_disable() \ -do { \ - ia64_stop(); \ - ia64_rsm(IA64_PSR_I); \ -} while (0) - -#define __local_irq_restore(x) ia64_intrin_local_irq_restore((x) & IA64_PSR_I) - -#ifdef CONFIG_IA64_DEBUG_IRQ - - extern unsigned long last_cli_ip; - -# define __save_ip() last_cli_ip = ia64_getreg(_IA64_REG_IP) - -# define local_irq_save(x) \ -do { \ - unsigned long psr; \ - \ - __local_irq_save(psr); \ - if (psr & IA64_PSR_I) \ - __save_ip(); \ - (x) = psr; \ -} while (0) - -# define local_irq_disable() do { unsigned long x; local_irq_save(x); } while (0) - -# define local_irq_restore(x) \ -do { \ - unsigned long old_psr, psr = (x); \ - \ - local_save_flags(old_psr); \ - __local_irq_restore(psr); \ - if ((old_psr & IA64_PSR_I) && !(psr & IA64_PSR_I)) \ - __save_ip(); \ -} while (0) - -#else /* !CONFIG_IA64_DEBUG_IRQ */ -# define local_irq_save(x) __local_irq_save(x) -# define local_irq_disable() __local_irq_disable() -# define local_irq_restore(x) __local_irq_restore(x) -#endif /* !CONFIG_IA64_DEBUG_IRQ */ - -#define local_irq_enable() ({ ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); }) -#define local_save_flags(flags) ({ ia64_stop(); (flags) = ia64_getreg(_IA64_REG_PSR); }) - -#define irqs_disabled() \ -({ \ - unsigned long __ia64_id_flags; \ - local_save_flags(__ia64_id_flags); \ - (__ia64_id_flags & IA64_PSR_I) == 0; \ -}) - #ifdef __KERNEL__ #ifdef CONFIG_IA32_SUPPORT @@ -260,6 +184,7 @@ #define ARCH_HAS_PREFETCH_SWITCH_STACK #define ia64_platform_is(x) (strcmp(x, platform_name) == 0) +#include void cpu_idle_wait(void); #define arch_align_stack(x) (x) diff -BruN linux-2.6.24-rc3/kernel/lockdep_internals.h linux-2.6.24-rc3-patched/kernel/lockdep_internals.h --- linux-2.6.24-rc3/kernel/lockdep_internals.h 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/kernel/lockdep_internals.h 2007-12-14 16:08:58.000000000 +0800 @@ -15,9 +15,13 @@ * table (if it's not there yet), and we check it for lock order * conflicts and deadlocks. */ -#define MAX_LOCKDEP_ENTRIES 8192UL +#define MAX_LOCKDEP_ENTRIES 65536UL /*8192UL*/ +#ifdef CONFIG_IA64 +#define MAX_LOCKDEP_KEYS_BITS 7 +#else #define MAX_LOCKDEP_KEYS_BITS 11 +#endif #define MAX_LOCKDEP_KEYS (1UL << MAX_LOCKDEP_KEYS_BITS) #define MAX_LOCKDEP_CHAINS_BITS 14 diff -BruN linux-2.6.24-rc3/lib/Kconfig.debug linux-2.6.24-rc3-patched/lib/Kconfig.debug --- linux-2.6.24-rc3/lib/Kconfig.debug 2007-12-04 03:40:26.000000000 +0800 +++ linux-2.6.24-rc3-patched/lib/Kconfig.debug 2007-12-14 16:08:24.000000000 +0800 @@ -306,7 +306,7 @@ config DEBUG_LOCKDEP bool "Lock dependency engine debugging" - depends on DEBUG_KERNEL && LOCKDEP + depends on DEBUG_KERNEL && LOCKDEP && !IA64 help If you say Y here, the lock dependency engine will do additional runtime checks to debug itself, at the price