Skip to content

Commit

Permalink
[PATCH] Fix typo in "syntax error if percpu macros are incorrectly us…
Browse files Browse the repository at this point in the history
…ed" 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: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jan Blunck authored and Linus Torvalds committed Oct 6, 2006
1 parent dc36670 commit a666ecf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion include/asm-generic/percpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extern unsigned long __per_cpu_offset[NR_CPUS];

/* var is in discarded region: offset to particular copy we want */
#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]); }))
#define __get_cpu_var(var) per_cpu(var, smp_processor_id())
#define __raw_get_cpu_var(var) per_cpu(var, raw_smp_processor_id())
Expand Down
4 changes: 2 additions & 2 deletions include/asm-s390/percpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#if defined(__s390x__) && defined(MODULE)

#define __reloc_hide(var,offset) (*({ \
extern int simple_indentifier_##var(void); \
extern int simple_identifier_##var(void); \
unsigned long *__ptr; \
asm ( "larl %0,per_cpu__"#var"@GOTENT" \
: "=a" (__ptr) : "X" (per_cpu__##var) ); \
Expand All @@ -25,7 +25,7 @@
#else

#define __reloc_hide(var, offset) (*({ \
extern int simple_indentifier_##var(void); \
extern int simple_identifier_##var(void); \
unsigned long __ptr; \
asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \
(typeof(&per_cpu__##var)) (__ptr + (offset)); }))
Expand Down
6 changes: 3 additions & 3 deletions include/asm-x86_64/percpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@

/* var is in discarded region: offset to particular copy we want */
#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)); }))
#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()); }))
#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()); }))

/* A macro to avoid #include hell... */
Expand Down
2 changes: 1 addition & 1 deletion include/linux/percpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* we force a syntax error here if it isn't.
*/
#define get_cpu_var(var) (*({ \
extern int simple_indentifier_##var(void); \
extern int simple_identifier_##var(void); \
preempt_disable(); \
&__get_cpu_var(var); }))
#define put_cpu_var(var) preempt_enable()
Expand Down

0 comments on commit a666ecf

Please sign in to comment.