diff options
author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2012-12-11 04:11:34 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-12-11 16:55:23 -0500 |
commit | 0ca0d818cbcbcac75a02833861b6fc42a98b904e (patch) | |
tree | 4cfaaa33cb3dcf860bd60a5b4559eb19ef777a08 | |
parent | 49f8a1a5394d8baee5e56fb71e5cf993c228689a (diff) |
x86/kexec: crash_vmclear_local_vmcss needs __rcu
This removes the sparse warning:
arch/x86/kernel/crash.c:49:32: sparse: incompatible types in comparison expression (different address spaces)
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | arch/x86/include/asm/kexec.h | 3 | ||||
-rw-r--r-- | arch/x86/kernel/crash.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index 28feeba2fdd6..6080d2694bad 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h | |||
@@ -163,7 +163,8 @@ struct kimage_arch { | |||
163 | }; | 163 | }; |
164 | #endif | 164 | #endif |
165 | 165 | ||
166 | extern void (*crash_vmclear_loaded_vmcss)(void); | 166 | typedef void crash_vmclear_fn(void); |
167 | extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; | ||
167 | 168 | ||
168 | #endif /* __ASSEMBLY__ */ | 169 | #endif /* __ASSEMBLY__ */ |
169 | 170 | ||
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 2f6b8e838d18..74467feb4dc5 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
@@ -38,12 +38,12 @@ int in_crash_kexec; | |||
38 | * | 38 | * |
39 | * protected by rcu. | 39 | * protected by rcu. |
40 | */ | 40 | */ |
41 | void (*crash_vmclear_loaded_vmcss)(void) = NULL; | 41 | crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss = NULL; |
42 | EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); | 42 | EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); |
43 | 43 | ||
44 | static inline void cpu_crash_vmclear_loaded_vmcss(void) | 44 | static inline void cpu_crash_vmclear_loaded_vmcss(void) |
45 | { | 45 | { |
46 | void (*do_vmclear_operation)(void) = NULL; | 46 | crash_vmclear_fn *do_vmclear_operation = NULL; |
47 | 47 | ||
48 | rcu_read_lock(); | 48 | rcu_read_lock(); |
49 | do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss); | 49 | do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss); |