aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-05-20 10:35:03 -0700
committerTony Luck <tony.luck@intel.com>2011-05-20 10:35:03 -0700
commit5e4de22bec1d78c009409200162da6a54631e9e4 (patch)
tree3954fe13eee1edb9aef80bb4dfc6fd486417bfdf /arch/ia64
parent3935bb949f360b5c8fbf7da268deb81d225d7b93 (diff)
parentff00c2a5b2308219ab952d01e5bb17b9ea772d7e (diff)
Pull misc-2.6.40 into release branch
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/oprofile/backtrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/oprofile/backtrace.c b/arch/ia64/oprofile/backtrace.c
index 5cdd7e4a597c..f7b798993cea 100644
--- 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 */

Privacy Policy