Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / include / asm-s390 / percpu.h

diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h
index 495ad99c76351c005ed6f95977902b4c2ea4f53f..9ea7f1023e578c0ff0a4eff47e77c5028d7e171b 100644 (file)
--- a/include/asm-s390/percpu.h
+++ b/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)); }))