From 43279db68d7e3069f4051b7e360728c11572ccf5 Mon Sep 17 00:00:00 2001
From: fvdl <fvdl@NetBSD.org>
Date: Fri, 8 Sep 1995 07:57:15 +0000
Subject: [PATCH] Fix PR #1445 (incorrect ifdef/else/endif), from Bill
 Sommerfeld via John Kohl.

---
 sys/arch/i386/i386/linux_machdep.c         | 5 ++---
 sys/compat/linux/arch/i386/linux_machdep.c | 5 ++---
 sys/compat/linux/i386/linux_machdep.c      | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c
index 45ff9f8975e3..61a6af2fc24e 100644
--- a/sys/arch/i386/i386/linux_machdep.c
+++ b/sys/arch/i386/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.17 1995/09/07 21:55:43 fvdl Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -134,14 +134,13 @@ linux_sendsig(catcher, sig, mask, code)
 		frame.sf_sc.sc_es = tf->tf_vm86_es;
 		frame.sf_sc.sc_ds = tf->tf_vm86_ds;
 	} else
-#else
+#endif
 	{
 		__asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs));
 		__asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs));
 		frame.sf_sc.sc_es = tf->tf_es;
 		frame.sf_sc.sc_ds = tf->tf_ds;
 	}
-#endif
 	frame.sf_sc.sc_edi    = tf->tf_edi;
 	frame.sf_sc.sc_esi    = tf->tf_esi;
 	frame.sf_sc.sc_ebp    = tf->tf_ebp;
diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c
index 45ff9f8975e3..61a6af2fc24e 100644
--- a/sys/compat/linux/arch/i386/linux_machdep.c
+++ b/sys/compat/linux/arch/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.17 1995/09/07 21:55:43 fvdl Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -134,14 +134,13 @@ linux_sendsig(catcher, sig, mask, code)
 		frame.sf_sc.sc_es = tf->tf_vm86_es;
 		frame.sf_sc.sc_ds = tf->tf_vm86_ds;
 	} else
-#else
+#endif
 	{
 		__asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs));
 		__asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs));
 		frame.sf_sc.sc_es = tf->tf_es;
 		frame.sf_sc.sc_ds = tf->tf_ds;
 	}
-#endif
 	frame.sf_sc.sc_edi    = tf->tf_edi;
 	frame.sf_sc.sc_esi    = tf->tf_esi;
 	frame.sf_sc.sc_ebp    = tf->tf_ebp;
diff --git a/sys/compat/linux/i386/linux_machdep.c b/sys/compat/linux/i386/linux_machdep.c
index 45ff9f8975e3..61a6af2fc24e 100644
--- a/sys/compat/linux/i386/linux_machdep.c
+++ b/sys/compat/linux/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.17 1995/09/07 21:55:43 fvdl Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -134,14 +134,13 @@ linux_sendsig(catcher, sig, mask, code)
 		frame.sf_sc.sc_es = tf->tf_vm86_es;
 		frame.sf_sc.sc_ds = tf->tf_vm86_ds;
 	} else
-#else
+#endif
 	{
 		__asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs));
 		__asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs));
 		frame.sf_sc.sc_es = tf->tf_es;
 		frame.sf_sc.sc_ds = tf->tf_ds;
 	}
-#endif
 	frame.sf_sc.sc_edi    = tf->tf_edi;
 	frame.sf_sc.sc_esi    = tf->tf_esi;
 	frame.sf_sc.sc_ebp    = tf->tf_ebp;