The patch titled
Fix typo in "syntax error if percpu macros are incorrectly used" patch
has been added to the -mm tree. Its filename is
fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix typo in "syntax error if percpu macros are incorrectly used" patch
From: Jan Blunck <jblunck@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-generic/percpu.h | 2 +-
include/asm-s390/percpu.h | 4 ++--
include/asm-x86_64/percpu.h | 6 +++---
include/linux/percpu.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff -puN include/asm-generic/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch include/asm-generic/percpu.h
--- a/include/asm-generic/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch
+++ a/include/asm-generic/percpu.h
@@ -15,7 +15,7 @@ extern unsigned long __per_cpu_offset[NR
/* 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())
diff -puN include/asm-s390/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch include/asm-s390/percpu.h
--- a/include/asm-s390/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch
+++ a/include/asm-s390/percpu.h
@@ -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)); }))
diff -puN include/asm-x86_64/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch include/asm-x86_64/percpu.h
--- a/include/asm-x86_64/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch
+++ a/include/asm-x86_64/percpu.h
@@ -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... */
diff -puN include/linux/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch include/linux/percpu.h
--- a/include/linux/percpu.h~fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch
+++ a/include/linux/percpu.h
@@ -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()
_
Patches currently in -mm which might be from jblunck@xxxxxxx are
fix-typo-in-syntax-error-if-percpu-macros-are-incorrectly-used-patch.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
