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

[linux-drm-fsl-dcu.git] / arch / um / drivers / xterm.c

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index aaa63666104333f487d01521bb6792250cb40a14..571c2b3325d573a1819d47b9d4e69f18a1c40540 100644 (file)
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -14,7 +14,6 @@
 #include <sys/socket.h>
 #include "kern_util.h"
 #include "chan_user.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 #include "xterm.h"
@@ -31,7 +30,7 @@ struct xterm_chan {
 };
 
 /* Not static because it's called directly by the tt mode gdb code */
-void *xterm_init(char *str, int device, struct chan_opts *opts)
+void *xterm_init(char *str, int device, const struct chan_opts *opts)
 {
        struct xterm_chan *data;
 
@@ -136,8 +135,6 @@ int xterm_open(int input, int output, int primary, void *d,
                return(pid);
        }
 
-       if(data->stack == 0) free_stack(stack, 0);
-
        if (data->direct_rcv) {
                new = os_rcv_fd(fd, &data->helper_pid);
        } else {
@@ -194,7 +191,7 @@ static void xterm_free(void *d)
        free(d);
 }
 
-struct chan_ops xterm_ops = {
+const struct chan_ops xterm_ops = {
        .type           = "xterm",
        .init           = xterm_init,
        .open           = xterm_open,