From 4fefdd1049fb2221a076f350819b0b5dee718c18 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 11 Dec 2012 17:11:34 +0800 Subject: [PATCH] --- yaml --- r: 343593 b: refs/heads/master c: 0ca0d818cbcbcac75a02833861b6fc42a98b904e h: refs/heads/master i: 343591: 09a01125920c580dacb5600c9ebc515c45323ff1 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kexec.h | 3 ++- trunk/arch/x86/kernel/crash.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fe54033d2c4b..595e63f6933f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49f8a1a5394d8baee5e56fb71e5cf993c228689a +refs/heads/master: 0ca0d818cbcbcac75a02833861b6fc42a98b904e diff --git a/trunk/arch/x86/include/asm/kexec.h b/trunk/arch/x86/include/asm/kexec.h index 28feeba2fdd6..6080d2694bad 100644 --- a/trunk/arch/x86/include/asm/kexec.h +++ b/trunk/arch/x86/include/asm/kexec.h @@ -163,7 +163,8 @@ struct kimage_arch { }; #endif -extern void (*crash_vmclear_loaded_vmcss)(void); +typedef void crash_vmclear_fn(void); +extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; #endif /* __ASSEMBLY__ */ diff --git a/trunk/arch/x86/kernel/crash.c b/trunk/arch/x86/kernel/crash.c index 2f6b8e838d18..74467feb4dc5 100644 --- a/trunk/arch/x86/kernel/crash.c +++ b/trunk/arch/x86/kernel/crash.c @@ -38,12 +38,12 @@ int in_crash_kexec; * * protected by rcu. */ -void (*crash_vmclear_loaded_vmcss)(void) = NULL; +crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss = NULL; EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); static inline void cpu_crash_vmclear_loaded_vmcss(void) { - void (*do_vmclear_operation)(void) = NULL; + crash_vmclear_fn *do_vmclear_operation = NULL; rcu_read_lock(); do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss);