diff options
author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-09-28 15:19:33 +0200 |
---|---|---|
committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-09-28 15:19:33 +0200 |
commit | 8fbb5848aca1cc6d5e7ad152713d2e198a5ee7cc (patch) | |
tree | 0a8a8e0f73a5f4be9a48455d3d6fb3283bd01c00 | |
parent | 77cdbfe8c535a436fe34e4d22c24a20da199d36c (diff) |
drop patches
-rw-r--r-- | debian/patches/0002-ddb-add-db_check_task_address_valid.patch | 52 | ||||
-rw-r--r-- | debian/patches/0003-ddb-add-kill-command.patch | 73 | ||||
-rw-r--r-- | debian/patches/make_send_right.patch | 30 | ||||
-rw-r--r-- | debian/patches/series | 3 |
4 files changed, 0 insertions, 158 deletions
diff --git a/debian/patches/0002-ddb-add-db_check_task_address_valid.patch b/debian/patches/0002-ddb-add-db_check_task_address_valid.patch deleted file mode 100644 index af9fcc2..0000000 --- a/debian/patches/0002-ddb-add-db_check_task_address_valid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b13ae86ed0df158d2d4fed826ced5472bf104543 Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Sat, 13 Sep 2014 01:27:46 +0200 -Subject: [PATCH 2/3] ddb: add db_check_task_address_valid - -* ddb/db_task_thread.c (db_check_task_address_valid): New function. -* ddb/db_task_thread.h (db_check_task_address_valid): New declaration. ---- - ddb/db_task_thread.c | 14 ++++++++++++++ - ddb/db_task_thread.h | 1 + - 2 files changed, 15 insertions(+) - -diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c -index edab17e..97c81c8 100644 ---- a/ddb/db_task_thread.c -+++ b/ddb/db_task_thread.c -@@ -135,6 +135,20 @@ db_lookup_thread(target_thread) - } - - /* -+ * check the address is a valid task address -+ */ -+boolean_t -+db_check_task_address_valid(const task_t task) -+{ -+ if (db_lookup_task(task) < 0) { -+ db_printf("Bad task address 0x%x\n", task); -+ db_flush_lex(); -+ return(FALSE); -+ } else -+ return(TRUE); -+} -+ -+/* - * check the address is a valid thread address - */ - boolean_t -diff --git a/ddb/db_task_thread.h b/ddb/db_task_thread.h -index cbb3680..18f1957 100644 ---- a/ddb/db_task_thread.h -+++ b/ddb/db_task_thread.h -@@ -46,6 +46,7 @@ extern thread_t db_default_thread; /* default target thread */ - extern int db_lookup_task(const task_t); - extern int db_lookup_thread(const thread_t); - extern int db_lookup_task_thread(const task_t, const thread_t); -+extern boolean_t db_check_task_address_valid(const task_t); - extern boolean_t db_check_thread_address_valid(const thread_t); - extern boolean_t db_get_next_thread(thread_t *, int); - extern void db_init_default_thread(void); --- -2.1.0 - diff --git a/debian/patches/0003-ddb-add-kill-command.patch b/debian/patches/0003-ddb-add-kill-command.patch deleted file mode 100644 index 93a9813..0000000 --- a/debian/patches/0003-ddb-add-kill-command.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 29fa60bd23ed84a470c7ebc7e0b031c136f3cf33 Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Sat, 13 Sep 2014 01:32:13 +0200 -Subject: [PATCH 3/3] ddb: add `kill' command - -* ddb/db_command.c (db_command_table): Add a `kill' command to -terminate tasks. -* ddb/db_task_thread.c (db_task_terminate): New function. -* ddb/db_task_thread.h (db_task_terminate): New declaration. ---- - ddb/db_command.c | 1 + - ddb/db_task_thread.c | 18 ++++++++++++++++++ - ddb/db_task_thread.h | 7 +++++++ - 3 files changed, 26 insertions(+) - -diff --git a/ddb/db_command.c b/ddb/db_command.c -index 5651667..74f191b 100644 ---- a/ddb/db_command.c -+++ b/ddb/db_command.c -@@ -362,6 +362,7 @@ struct db_command db_command_table[] = { - { "macro", db_def_macro_cmd, CS_OWN, 0 }, - { "dmacro", db_del_macro_cmd, CS_OWN, 0 }, - { "show", 0, 0, db_show_cmds }, -+ { "kill", db_task_terminate, 0, 0 }, - { "reset", db_reset_cpu, 0, 0 }, - { "reboot", db_reset_cpu, 0, 0 }, - { "halt", db_halt_cpu, 0, 0 }, -diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c -index 97c81c8..5309d73 100644 ---- a/ddb/db_task_thread.c -+++ b/ddb/db_task_thread.c -@@ -317,4 +317,22 @@ db_get_task_thread( - return; - } - -+/* ARGSUSED */ -+void -+db_task_terminate(db_expr_t addr, -+ boolean_t have_addr, -+ db_expr_t count, -+ const char *modif) -+{ -+ task_t task = (task_t) addr; -+ -+ if (! have_addr) -+ db_error("No task\n"); -+ -+ if (! db_check_task_address_valid(task)) -+ db_error(0); -+ -+ task_terminate(task); -+} -+ - #endif /* MACH_KDB */ -diff --git a/ddb/db_task_thread.h b/ddb/db_task_thread.h -index 18f1957..c095aac 100644 ---- a/ddb/db_task_thread.h -+++ b/ddb/db_task_thread.h -@@ -65,4 +65,11 @@ db_get_task_thread( - int flag, - db_var_aux_param_t ap); - -+extern void -+db_task_terminate( -+ db_expr_t addr, -+ boolean_t have_addr, -+ db_expr_t count, -+ const char *modif); -+ - #endif /* _DDB_DB_TASK_THREAD_H_ */ --- -2.1.0 - diff --git a/debian/patches/make_send_right.patch b/debian/patches/make_send_right.patch deleted file mode 100644 index 43abdc5..0000000 --- a/debian/patches/make_send_right.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/kern/bootstrap.c b/kern/bootstrap.c -index d919e90..4edae7b 100644 ---- a/kern/bootstrap.c -+++ b/kern/bootstrap.c -@@ -155,13 +155,13 @@ void bootstrap_create(void) - /* Initialize boot script variables. We leak these send rights. */ - losers = boot_script_set_variable - ("host-port", VAL_PORT, -- (long)ipc_port_make_send(realhost.host_priv_self)); -+ (long) realhost.host_priv_self); - if (losers) - panic ("cannot set boot-script variable host-port: %s", - boot_script_error_string (losers)); - losers = boot_script_set_variable - ("device-port", VAL_PORT, -- (long) ipc_port_make_send(master_device_port)); -+ (long) master_device_port); - if (losers) - panic ("cannot set boot-script variable device-port: %s", - boot_script_error_string (losers)); -@@ -838,7 +838,8 @@ boot_script_free_task (task_t task, int aborting) - int - boot_script_insert_right (struct cmd *cmd, mach_port_t port, mach_port_t *name) - { -- *name = task_insert_send_right (cmd->task, (ipc_port_t)port); -+ *name = task_insert_send_right (cmd->task, -+ ipc_port_make_send((ipc_port_t) port)); - return 0; - } - diff --git a/debian/patches/series b/debian/patches/series index d5d6e53..14fccb4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,3 @@ protected_payload.patch Add-some-padding-to-make-objects-fit-a-single-cache-.patch -0002-ddb-add-db_check_task_address_valid.patch -0003-ddb-add-kill-command.patch -make_send_right.patch |