summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/sn
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-19 14:24:01 -0700
committerKees Cook <keescook@chromium.org>2017-11-02 15:50:33 -0700
commit2c513d4f7da7d5616d9e19232376edd4e18fef24 (patch)
tree410fbf45c3eecee4e03477566d42182d26db0e8d /arch/ia64/include/asm/sn
parentd8479a21a98baf1bb50426986d15605cee96ec36 (diff)
downloadlinux-stable-2c513d4f7da7d5616d9e19232376edd4e18fef24.tar.gz
linux-stable-2c513d4f7da7d5616d9e19232376edd4e18fef24.tar.bz2
linux-stable-2c513d4f7da7d5616d9e19232376edd4e18fef24.zip
ia64: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. One less trivial change was removing the repeated casting for callers of bte_error_handler() by fixing its function declaration and adding a small wrapper for the timer callback instead. Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Joe Perches <joe@perches.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: linux-ia64@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'arch/ia64/include/asm/sn')
-rw-r--r--arch/ia64/include/asm/sn/bte.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sn/bte.h b/arch/ia64/include/asm/sn/bte.h
index cc6c4dbf53af..cd71ab5faf62 100644
--- a/arch/ia64/include/asm/sn/bte.h
+++ b/arch/ia64/include/asm/sn/bte.h
@@ -17,6 +17,8 @@
#include <asm/sn/types.h>
#include <asm/sn/shub_mmr.h>
+struct nodepda_s;
+
#define IBCT_NOTIFY (0x1UL << 4)
#define IBCT_ZFIL_MODE (0x1UL << 0)
@@ -210,7 +212,7 @@ struct bteinfo_s {
*/
extern bte_result_t bte_copy(u64, u64, u64, u64, void *);
extern bte_result_t bte_unaligned_copy(u64, u64, u64, u64);
-extern void bte_error_handler(unsigned long);
+extern void bte_error_handler(struct nodepda_s *);
#define bte_zero(dest, len, mode, notification) \
bte_copy(0, dest, len, ((mode) | BTE_ZERO_FILL), notification)