Pull misc-2.6.40 into release branch

git-mirror · May 20, 2011 · 5e4de22 · 5e4de22
2 parents 3935bb9 + ff00c2a
commit 5e4de22
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 */