Merge tag 'docs-5.15' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / ia64 / include / uapi / asm / cmpxchg.h

diff --git a/arch/ia64/include/uapi/asm/cmpxchg.h b/arch/ia64/include/uapi/asm/cmpxchg.h
index 926c6cb..2c2f3cf 100644 (file)
--- a/arch/ia64/include/uapi/asm/cmpxchg.h
+++ b/arch/ia64/include/uapi/asm/cmpxchg.h
@@ -143,9 +143,9 @@ extern long ia64_cmpxchg_called_with_bad_pointer(void);
 do {                                                                   \
        if (_cmpxchg_bugcheck_count-- <= 0) {                           \
                void *ip;                                               \
-               extern int printk(const char *fmt, ...);                \
+               extern int _printk(const char *fmt, ...);               \
                ip = (void *) ia64_getreg(_IA64_REG_IP);                \
-               printk("CMPXCHG_BUGCHECK: stuck at %p on word %p\n", ip, (v));\
+               _printk("CMPXCHG_BUGCHECK: stuck at %p on word %p\n", ip, (v));\
                break;                                                  \
        }                                                               \
 } while (0)