Commit a666ecfb authored by Jan Blunck's avatar Jan Blunck Committed by Linus Torvalds

[PATCH] Fix typo in "syntax error if percpu macros are incorrectly used" patch

Trivial typo fix in the "syntax error if percpu macros are incorrectly
used" patch.  I misspelled "identifier" in all places.  D'Oh!

Thanks to Dirk Mueller to point this out.
Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dc366708
...@@ -15,7 +15,7 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; ...@@ -15,7 +15,7 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
/* var is in discarded region: offset to particular copy we want */ /* var is in discarded region: offset to particular copy we want */
#define per_cpu(var, cpu) (*({ \ #define per_cpu(var, cpu) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu]); })) RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu]); }))
#define __get_cpu_var(var) per_cpu(var, smp_processor_id()) #define __get_cpu_var(var) per_cpu(var, smp_processor_id())
#define __raw_get_cpu_var(var) per_cpu(var, raw_smp_processor_id()) #define __raw_get_cpu_var(var) per_cpu(var, raw_smp_processor_id())
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#if defined(__s390x__) && defined(MODULE) #if defined(__s390x__) && defined(MODULE)
#define __reloc_hide(var,offset) (*({ \ #define __reloc_hide(var,offset) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
unsigned long *__ptr; \ unsigned long *__ptr; \
asm ( "larl %0,per_cpu__"#var"@GOTENT" \ asm ( "larl %0,per_cpu__"#var"@GOTENT" \
: "=a" (__ptr) : "X" (per_cpu__##var) ); \ : "=a" (__ptr) : "X" (per_cpu__##var) ); \
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#else #else
#define __reloc_hide(var, offset) (*({ \ #define __reloc_hide(var, offset) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
unsigned long __ptr; \ unsigned long __ptr; \
asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \ asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \
(typeof(&per_cpu__##var)) (__ptr + (offset)); })) (typeof(&per_cpu__##var)) (__ptr + (offset)); }))
......
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
/* var is in discarded region: offset to particular copy we want */ /* var is in discarded region: offset to particular copy we want */
#define per_cpu(var, cpu) (*({ \ #define per_cpu(var, cpu) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); })) RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); }))
#define __get_cpu_var(var) (*({ \ #define __get_cpu_var(var) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); })) RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
#define __raw_get_cpu_var(var) (*({ \ #define __raw_get_cpu_var(var) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); })) RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
/* A macro to avoid #include hell... */ /* A macro to avoid #include hell... */
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* we force a syntax error here if it isn't. * we force a syntax error here if it isn't.
*/ */
#define get_cpu_var(var) (*({ \ #define get_cpu_var(var) (*({ \
extern int simple_indentifier_##var(void); \ extern int simple_identifier_##var(void); \
preempt_disable(); \ preempt_disable(); \
&__get_cpu_var(var); })) &__get_cpu_var(var); }))
#define put_cpu_var(var) preempt_enable() #define put_cpu_var(var) preempt_enable()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment