1 files changed, 3 insertions, 17 deletions

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index dc580c42851c..c0fa356e90de 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
@@ -44,28 +44,14 @@ struct nmiaction {
         const char              *name;
 };
 
-#define register_nmi_handler(t, fn, fg, n)              \
+#define register_nmi_handler(t, fn, fg, n, init...)     \
 ({                                                      \
-        static struct nmiaction fn##_na = {             \
+        static struct nmiaction init fn##_na = {        \
                 .handler = (fn),                        \
                 .name = (n),                            \
                 .flags = (fg),                          \
         };                                              \
-        __register_nmi_handler((t), &fn##_na);  \
-})
-
-/*
- * For special handlers that register/unregister in the
- * init section only.  This should be considered rare.
- */
-#define register_nmi_handler_initonly(t, fn, fg, n)             \
-({                                                      \
-        static struct nmiaction fn##_na __initdata = {          \
-                .handler = (fn),                        \
-                .name = (n),                            \
-                .flags = (fg),                          \
-        };                                              \
-        __register_nmi_handler((t), &fn##_na);  \
+        __register_nmi_handler((t), &fn##_na);          \
 })
 
 int __register_nmi_handler(unsigned int, struct nmiaction *);