diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/uv/bios.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/bios_uv.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h index da1c4e8e78fc..7ed17ff502b9 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h | |||
@@ -100,7 +100,7 @@ extern s64 uv_bios_call_reentrant(enum uv_bios_cmd, u64, u64, u64, u64, u64); | |||
100 | 100 | ||
101 | extern s64 uv_bios_get_sn_info(int, int *, long *, long *, long *); | 101 | extern s64 uv_bios_get_sn_info(int, int *, long *, long *, long *); |
102 | extern s64 uv_bios_freq_base(u64, u64 *); | 102 | extern s64 uv_bios_freq_base(u64, u64 *); |
103 | extern int uv_bios_mq_watchlist_alloc(int, void *, unsigned int, | 103 | extern int uv_bios_mq_watchlist_alloc(int, unsigned long, unsigned int, |
104 | unsigned long *); | 104 | unsigned long *); |
105 | extern int uv_bios_mq_watchlist_free(int, int); | 105 | extern int uv_bios_mq_watchlist_free(int, int); |
106 | extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect); | 106 | extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect); |
diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/kernel/bios_uv.c index d22d0f1bbea0..2a0a2a3cac26 100644 --- a/arch/x86/kernel/bios_uv.c +++ b/arch/x86/kernel/bios_uv.c | |||
@@ -101,15 +101,13 @@ s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, | |||
101 | } | 101 | } |
102 | 102 | ||
103 | int | 103 | int |
104 | uv_bios_mq_watchlist_alloc(int blade, void *mq, unsigned int mq_size, | 104 | uv_bios_mq_watchlist_alloc(int blade, unsigned long addr, unsigned int mq_size, |
105 | unsigned long *intr_mmr_offset) | 105 | unsigned long *intr_mmr_offset) |
106 | { | 106 | { |
107 | union uv_watchlist_u size_blade; | 107 | union uv_watchlist_u size_blade; |
108 | unsigned long addr; | ||
109 | u64 watchlist; | 108 | u64 watchlist; |
110 | s64 ret; | 109 | s64 ret; |
111 | 110 | ||
112 | addr = (unsigned long)mq; | ||
113 | size_blade.size = mq_size; | 111 | size_blade.size = mq_size; |
114 | size_blade.blade = blade; | 112 | size_blade.blade = blade; |
115 | 113 | ||