update feature-task-name.patch

1 files changed, 39 insertions, 73 deletions

diff --git a/debian/patches/feature-task-name.patch b/debian/patches/feature-task-name.patch
index 36fc784..77ee2ca 100644
--- a/debian/patches/feature-task-name.patch
+++ b/debian/patches/feature-task-name.patch
@@ -1,79 +1,12 @@
-diff --git a/include/mach/debug.defs b/include/mach/debug.defs
-new file mode 100644
-index 0000000..49959ba
---- /dev/null
-+++ b/include/mach/debug.defs
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright (c) 2014 Free Software Foundation.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _KERN_DEBUG_DEFS_
-+#define _KERN_DEBUG_DEFS_
-+
-+type kernel_debug_name_t = c_string[*: 64];
-+
-+#endif /* _KERN_DEBUG_DEFS_ */
-diff --git a/include/mach/debug.h b/include/mach/debug.h
-new file mode 100644
-index 0000000..149d800
---- /dev/null
-+++ b/include/mach/debug.h
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright (c) 2014 Free Software Foundation.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _KERN_DEBUG_H_
-+#define _KERN_DEBUG_H_
-+
-+/*
-+ *	A fixed-length string data type intended for names given to
-+ *	kernel objects.
-+ *
-+ *	Note that it is not guaranteed that the in-kernel data
-+ *	structure will hold KERNEL_DEBUG_NAME_MAX bytes.  The given
-+ *	name will be truncated to fit into the target data structure.
-+ */
-+#define KERNEL_DEBUG_NAME_MAX (64)
-+typedef char	kernel_debug_name_t[KERNEL_DEBUG_NAME_MAX];
-+
-+#endif /* _KERN_DEBUG_H_ */
 diff --git a/include/mach/gnumach.defs b/include/mach/gnumach.defs
-index 12c4e99..273e30b 100644
+index 12c4e99..6cfbb0d 100644
 --- a/include/mach/gnumach.defs
 +++ b/include/mach/gnumach.defs
 @@ -27,6 +27,7 @@ subsystem
  
  #include <mach/std_types.defs>
  #include <mach/mach_types.defs>
-+#include <mach/debug.defs>
++#include <mach_debug/mach_debug_types.defs>
  
  type vm_cache_statistics_data_t = struct[11] of integer_t;
  
@@ -89,6 +22,39 @@ index 12c4e99..273e30b 100644
 +simpleroutine task_set_name(
 +		task	: task_t;
 +		name	: kernel_debug_name_t);
+diff --git a/include/mach_debug/mach_debug_types.defs b/include/mach_debug/mach_debug_types.defs
+index f60125a..d24b6f9 100644
+--- a/include/mach_debug/mach_debug_types.defs
++++ b/include/mach_debug/mach_debug_types.defs
+@@ -57,6 +57,8 @@ type vm_page_info_array_t = array[] of vm_page_info_t;
+ 
+ type symtab_name_t = (MACH_MSG_TYPE_STRING_C, 8*32);
+ 
++type kernel_debug_name_t = c_string[*: 64];
++
+ import <mach_debug/mach_debug_types.h>;
+ 
+ #endif	/* _MACH_DEBUG_MACH_DEBUG_TYPES_DEFS_ */
+diff --git a/include/mach_debug/mach_debug_types.h b/include/mach_debug/mach_debug_types.h
+index 5d4efcd..9c7d1fd 100644
+--- a/include/mach_debug/mach_debug_types.h
++++ b/include/mach_debug/mach_debug_types.h
+@@ -37,4 +37,15 @@
+ 
+ typedef	char	symtab_name_t[32];
+ 
++/*
++ *	A fixed-length string data type intended for names given to
++ *	kernel objects.
++ *
++ *	Note that it is not guaranteed that the in-kernel data
++ *	structure will hold KERNEL_DEBUG_NAME_MAX bytes.  The given
++ *	name will be truncated to fit into the target data structure.
++ */
++#define KERNEL_DEBUG_NAME_MAX (64)
++typedef char	kernel_debug_name_t[KERNEL_DEBUG_NAME_MAX];
++
+ #endif	/* _MACH_DEBUG_MACH_DEBUG_TYPES_H_ */
 diff --git a/ipc/mach_port.c b/ipc/mach_port.c
 index fbc5e69..891d2f2 100644
 --- a/ipc/mach_port.c
@@ -159,14 +125,14 @@ index d1e3632..3fc95b6 100644
      switch(error) {
      case KMEM_ERR_INVALID:
 diff --git a/kern/task.c b/kern/task.c
-index 13b3c76..0c45d43 100644
+index 13b3c76..82848b2 100644
 --- a/kern/task.c
 +++ b/kern/task.c
 @@ -37,6 +37,7 @@
  #include <mach/vm_param.h>
  #include <mach/task_info.h>
  #include <mach/task_special_ports.h>
-+#include <mach/debug.h>
++#include <mach_debug/mach_debug_types.h>
  #include <ipc/ipc_space.h>
  #include <ipc/ipc_types.h>
  #include <kern/debug.h>
@@ -210,14 +176,14 @@ index 13b3c76..0c45d43 100644
   *
   *	Attempt to free resources owned by tasks.
 diff --git a/kern/task.h b/kern/task.h
-index e852033..bf5bb53 100644
+index e852033..3c10dc0 100644
 --- a/kern/task.h
 +++ b/kern/task.h
 @@ -39,6 +39,7 @@
  #include <mach/time_value.h>
  #include <mach/mach_param.h>
  #include <mach/task_info.h>
-+#include <mach/debug.h>
++#include <mach_debug/mach_debug_types.h>
  #include <kern/kern_types.h>
  #include <kern/lock.h>
  #include <kern/queue.h>