Pull bugzilla-7570 into release branch

[linux-2.6] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index d0e03c4a71b1c5ba95859747d203c7d8986bd474..dee72b9a20fb320e6809002f3d186e4d0103e611 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -197,8 +197,8 @@ struct tty_struct {
        struct mutex termios_mutex;
        struct ktermios *termios, *termios_locked;
        char name[64];
-       int pgrp;
-       int session;
+       struct pid *pgrp;
+       struct pid *session;
        unsigned long flags;
        int count;
        struct winsize winsize;