Revert "UBUNTU: SAUCE: x86/kvm: Fix stuff_RSB() for 32-bit"

CVE-2017-5753 (revert embargoed)
CVE-2017-5715 (revert embargoed)

This reverts commit e8d5c968.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

arch/x86/include/asm/kvm_host.h

@@ -194,13 +194,9 @@ static inline void stuff_RSB(void)
 .label31:	\n\
 	call .label32	\n\
 	pause	\n\
-.label32: \n"
-#ifdef CONFIG_X86_64
-" 	add $(32*8), %%rsp 	\n"
-#else
-" 	add $(32*4), %%esp 	\n"
-#endif
-: : :"memory");
+.label32: \n\
+	add $(32*8), %%rsp 	\n\
+": : :"memory");
 }
 
 enum kvm_reg {