32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
|
From: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
Subject: kdb: Fix assignment from incompatible pointer warnings
|
||
|
|
Patch-mainline: not yet, whenever KDB is upstream
|
||
|
|
|
||
|
|
info->pfs_loc is an unsigned long *, not a u64 *.
|
||
|
|
|
||
|
|
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
---
|
||
|
|
arch/ia64/kdb/kdba_bt.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/ia64/kdb/kdba_bt.c
|
||
|
|
+++ b/arch/ia64/kdb/kdba_bt.c
|
||
|
|
@@ -112,7 +112,7 @@ bt_print_one(kdb_machreg_t ip,
|
||
|
|
}
|
||
|
|
if (btsp)
|
||
|
|
kdb_printf(" sp 0x%016lx bsp 0x%016lx cfm 0x%016lx info->pfs_loc 0x%016lx 0x%016lx\n",
|
||
|
|
- sp, bsp, cfm, (u64) info->pfs_loc, info->pfs_loc ? *(info->pfs_loc) : 0);
|
||
|
|
+ sp, bsp, cfm, info->pfs_loc, info->pfs_loc ? *(info->pfs_loc) : 0);
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -142,7 +142,7 @@ kdba_bt_stack(int argcount, const struct
|
||
|
|
struct pt_regs *regs = NULL;
|
||
|
|
int count = 0;
|
||
|
|
int btsp = 0; /* Backtrace the kdb code as well */
|
||
|
|
- u64 *prev_pfs_loc = NULL;
|
||
|
|
+ unsigned long *prev_pfs_loc = NULL;
|
||
|
|
extern char __attribute__ ((weak)) ia64_spinlock_contention_pre3_4[];
|
||
|
|
extern char __attribute__ ((weak)) ia64_spinlock_contention_pre3_4_end[];
|
||
|
|
|