diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
| commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
| tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /include/linux/percpu.h | |
| parent | 15c5ab607045e278ebf4d2ca4aea2250617d50ca (diff) | |
| parent | 147fcf1c211f1a87bf4d0711b7e9637f3d6ce080 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index b8b9084527b..49466b13c5c 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -149,7 +149,7 @@ extern void __init percpu_init_late(void); #else /* CONFIG_SMP */ -#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); }) +#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR((ptr)); }) /* can't distinguish from other static vars, always false */ static inline bool is_kernel_percpu_address(unsigned long addr) |