Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / um / kernel / tt / gdb.c

diff --git a/arch/um/kernel/tt/gdb.c b/arch/um/kernel/tt/gdb.c
index 37e22d71a0d9d5c546326e5a19276ec54524ac14..030e4658f36bc5a0d8a39a80724cfba6fd1b3c1d 100644 (file)
--- a/arch/um/kernel/tt/gdb.c
+++ b/arch/um/kernel/tt/gdb.c
@@ -17,9 +17,9 @@
 #include "user.h"
 #include "debug.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "tt.h"
 #include "sysdep/thread.h"
+#include "os.h"
 
 extern int debugger_pid;
 extern int debugger_fd;
@@ -114,6 +114,8 @@ struct gdb_data {
        int err;
 };
 
+extern char *linux_prog;
+
 static void config_gdb_cb(void *arg)
 {
        struct gdb_data *data = arg;
@@ -138,7 +140,7 @@ static void config_gdb_cb(void *arg)
        init_proxy(debugger_pid, 0, 0);
 }
 
-int gdb_config(char *str)
+int gdb_config(char *str, char **error_out)
 {
        struct gdb_data data;
 
@@ -153,7 +155,7 @@ void remove_gdb_cb(void *unused)
        exit_debugger_cb(NULL);
 }
 
-int gdb_remove(int unused)
+int gdb_remove(int unused, char **error_out)
 {
        initial_thread_cb(remove_gdb_cb, NULL);
         return 0;