diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /include/linux/percpu.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
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 46ec72fa2c84..600e3d387ffc 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | * we force a syntax error here if it isn't. | 19 | * we force a syntax error here if it isn't. |
| 20 | */ | 20 | */ |
| 21 | #define get_cpu_var(var) (*({ \ | 21 | #define get_cpu_var(var) (*({ \ |
| 22 | extern int simple_indentifier_##var(void); \ | 22 | extern int simple_identifier_##var(void); \ |
| 23 | preempt_disable(); \ | 23 | preempt_disable(); \ |
| 24 | &__get_cpu_var(var); })) | 24 | &__get_cpu_var(var); })) |
| 25 | #define put_cpu_var(var) preempt_enable() | 25 | #define put_cpu_var(var) preempt_enable() |