Pull misc-2.6.40 into release branch

diff --git a/arch/ia64/oprofile/backtrace.c b/arch/ia64/oprofile/backtrace.c
index 5cdd7e4a597ce97eb17767c726e88358e06ee1bf..f7b798993cea0cab958427c5a09946eed673ef49 100644 (file)
--- a/arch/ia64/oprofile/backtrace.c
+++ b/arch/ia64/oprofile/backtrace.c
@@ -29,7 +29,7 @@ typedef struct
        unsigned int depth;
        struct pt_regs *regs;
        struct unw_frame_info frame;
-       u64 *prev_pfs_loc;      /* state for WAR for old spinlock ool code */
+       unsigned long *prev_pfs_loc;    /* state for WAR for old spinlock ool code */
 } ia64_backtrace_t;
 
 /* Returns non-zero if the PC is in the Interrupt Vector Table */