diff --git a/target-i386/helper.c b/target-i386/helper.c
index 7cda864b7b..57e6f7c806 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -776,7 +776,7 @@ static int cpu_x86_register (CPUX86State *env, const char *cpu_model)
     return 0;
 }
 
-#if !defined(CONFIG_LINUX_USER)
+#if !defined(CONFIG_USER_ONLY)
 /* copy vendor id string to 32 bit register, nul pad as needed
  */
 static void cpyid(const char *s, uint32_t *id)
@@ -879,7 +879,7 @@ static int cpudef_register(QemuOpts *opts, void *opaque)
     x86_defs = def;
     return (0);
 }
-#endif	/* !CONFIG_LINUX_USER */
+#endif /* !CONFIG_USER_ONLY */
 
 /* register "cpudef" models defined in configuration file.  Here we first
  * preload any built-in definitions
@@ -893,7 +893,7 @@ void x86_cpudef_setup(void)
         builtin_x86_defs[i].flags = 1;
         x86_defs = &builtin_x86_defs[i];
     }
-#if !defined(CONFIG_LINUX_USER)
+#if !defined(CONFIG_USER_ONLY)
     qemu_opts_foreach(&qemu_cpudef_opts, cpudef_register, NULL, 0);
 #endif
 }