Patch from Alexey is inline.
On 13:37 Thu 10 Dec , Sergey Bronnikov wrote:
> Please apply.
> Date: Thu, 10 Dec 2015 01:48:05 +0300
> From: [email protected]
> To: Sergey Bronnikov <[email protected]>
> CC: [email protected]
> Subject: pty.c в ядре RHEL-7
> Message-ID: <[email protected]>
>
> --- vzkernel.old/drivers/tty/pty.c 2015-12-10 01:42:38.000000000 +0300
> +++ vzkernel/drivers/tty/pty.c 2015-12-10 01:13:21.000000000 +0300
> @@ -23,6 +23,7 @@
> #include <linux/devpts_fs.h>
> #include <linux/slab.h>
> #include <linux/mutex.h>
> +#include <linux/ve.h>
>
> #include <bc/misc.h>
>
>
> --
> Alexey V. Vissarionov aka Gremlin from Kremlin
> GPG: 8832FE9FA791F7968AC96E4E909DAC45EF3B1FA8
> --- vzkernel.old/drivers/tty/pty.c 2015-12-10 01:42:38.000000000 +0300
> +++ vzkernel/drivers/tty/pty.c 2015-12-10 01:13:21.000000000 +0300
> @@ -23,6 +23,7 @@
> #include <linux/devpts_fs.h>
> #include <linux/slab.h>
> #include <linux/mutex.h>
> +#include <linux/ve.h>
>
> #include <bc/misc.h>
--- vzkernel.old/kernel/ve/ve.c 2015-12-10 01:42:47.000000000 +0300
+++ vzkernel/kernel/ve/ve.c 2015-12-10 02:10:12.000000000 +0300
@@ -476,9 +476,11 @@
if (err)
goto err_umh;
+#ifdef CONFIG_LEGACY_PTYS
err = ve_legacy_pty_init(ve);
if (err)
goto err_legacy_pty;
+#endif
err = ve_tty_console_init(ve);
if (err)
@@ -499,8 +501,10 @@
err_iterate:
ve_tty_console_fini(ve);
err_tty_console:
+#ifdef CONFIG_LEGACY_PTYS
ve_legacy_pty_fini(ve);
err_legacy_pty:
+#endif
ve_stop_umh(ve);
err_umh:
ve_stop_kthread(ve);
@@ -532,7 +536,9 @@
ve->is_running = 0;
ve_tty_console_fini(ve);
+#ifdef CONFIG_LEGACY_PTYS
ve_legacy_pty_fini(ve);
+#endif
ve_stop_umh(ve);
/*
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
