From beff3f7516ba69a9960bf9009ceafbb471d66a8d Mon Sep 17 00:00:00 2001
From: njoly <njoly@NetBSD.org>
Date: Tue, 21 Oct 2008 20:24:15 +0000
Subject: [PATCH] Remove LINUX_SI_xxx from MI siginfo.h, that should not have
 been committed. Rather add them to amd64 MD header. Fix compilation failures
 on non x86 archs.

---
 sys/compat/linux/arch/amd64/linux_siginfo.h | 15 ++++++++++++++-
 sys/compat/linux/common/linux_siginfo.h     | 12 +-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/sys/compat/linux/arch/amd64/linux_siginfo.h b/sys/compat/linux/arch/amd64/linux_siginfo.h
index dc7b650e3233..91fb76380167 100644
--- a/sys/compat/linux/arch/amd64/linux_siginfo.h
+++ b/sys/compat/linux/arch/amd64/linux_siginfo.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_siginfo.h,v 1.2 2005/12/11 12:20:14 christos Exp $ */
+/*	$NetBSD: linux_siginfo.h,v 1.3 2008/10/21 20:24:15 njoly Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -83,4 +83,17 @@ struct linux_siginfo {
 	} _sifields;
 } linux_siginfo_t;
 
+/*
+ * si_code values for non-signals
+ */
+#define LINUX_SI_USER		0
+#define LINUX_SI_KERNEL		0x80
+#define LINUX_SI_QUEUE		-1
+#define LINUX_SI_TIMER		-2
+#define LINUX_SI_MESGQ		-3
+#define LINUX_SI_ASYNCIO	-4
+#define LINUX_SI_SIGIO		-5
+#define LINUX_SI_TKILL		-6
+#define LINUX_SI_DETHREAD	-7
+
 #endif /* !_AMD64_LINUX_SIGINFO_H */
diff --git a/sys/compat/linux/common/linux_siginfo.h b/sys/compat/linux/common/linux_siginfo.h
index 683466c46a72..de5e4f7bdac5 100644
--- a/sys/compat/linux/common/linux_siginfo.h
+++ b/sys/compat/linux/common/linux_siginfo.h
@@ -1,4 +1,4 @@
-/* 	$NetBSD: linux_siginfo.h,v 1.12 2008/10/19 09:44:31 njoly Exp $	*/
+/* 	$NetBSD: linux_siginfo.h,v 1.13 2008/10/21 20:24:15 njoly Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,16 +48,6 @@
 #include <compat/linux/arch/amd64/linux_siginfo.h>
 #endif
 
-/* si_code values */
-#define	LINUX_SI_USER		0
-#define	LINUX_SI_QUEUE		-1
-#define	LINUX_SI_TIMER		-2
-#define	LINUX_SI_MESGQ		-3
-#define	LINUX_SI_ASYNCIO	-4
-#define	LINUX_SI_SIGIO		-5
-#define	LINUX_SI_TKILL		-6
-#define	LINUX_SI_DETHREAD	-7
-
 /* From linux/include/asm-generic/siginfo.h */
 #define LINUX_CLD_EXITED	1
 #define LINUX_CLD_KILLED	2