Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

include/asm-generic/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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())

include/asm-s390/percpu.h

+2 −2
Original line number Diff line number Diff line
@@ -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) );	\
@@ -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)); }))

include/asm-x86_64/percpu.h

+3 −3
Original line number Diff line number Diff line
@@ -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... */

include/linux/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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()