diff --git a/target-i386/helper.c b/target-i386/helper.c
index 4017bee79c..c2b5e11001 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1217,6 +1217,18 @@ void raise_exception(int exception_index)
 
 /* SMM support */
 
+#if defined(CONFIG_USER_ONLY) 
+
+void do_smm_enter(void)
+{
+}
+
+void helper_rsm(void)
+{
+}
+
+#else
+
 #ifdef TARGET_X86_64
 #define SMM_REVISION_ID 0x00020064
 #else
@@ -1483,6 +1495,9 @@ void helper_rsm(void)
     }
 }
 
+#endif /* !CONFIG_USER_ONLY */
+
+
 #ifdef BUGGY_GCC_DIV64
 /* gcc 2.95.4 on PowerPC does not seem to like using __udivdi3, so we
    call it from another function */