summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJiri Olsa <Jiri Olsa jolsa@redhat.com>2010-04-06 11:44:36 +0200
committerJiri Olsa <Jiri Olsa jolsa@redhat.com>2010-04-06 11:44:36 +0200
commitb46c7cd38627e8bf21f4314e373515305d91f1a7 (patch)
tree945708791285abbb53311cab00ff808a0732c63a /kernel
parent6ec8cd6803ea46fed6b106c9fe7c7aeaa7ac54e9 (diff)
downloadtsnif-b46c7cd38627e8bf21f4314e373515305d91f1a7.tar.gz
tsnif-b46c7cd38627e8bf21f4314e373515305d91f1a7.tar.xz
tsnif-b46c7cd38627e8bf21f4314e373515305d91f1a7.zip
kernel patch changed
Diffstat (limited to 'kernel')
-rw-r--r--kernel/0001-tty-notifier.patch10
-rw-r--r--kernel/0002-gennl-changes-adding-non-locking-multicast-functions.patch2
-rw-r--r--kernel/0003-alive.patch4
3 files changed, 8 insertions, 8 deletions
diff --git a/kernel/0001-tty-notifier.patch b/kernel/0001-tty-notifier.patch
index f949cdd..d0dbf79 100644
--- a/kernel/0001-tty-notifier.patch
+++ b/kernel/0001-tty-notifier.patch
@@ -1,4 +1,4 @@
-From cc94a9f1f292495947e5e9ece38020798640cf7c Mon Sep 17 00:00:00 2001
+From 8e0eded3aa1159d3ccdc89fd1d83b71dd5b8cee1 Mon Sep 17 00:00:00 2001
From: jolsa@redhat.com <jolsa@redhat.com>
Date: Mon, 8 Mar 2010 17:52:48 +0100
Subject: [PATCH 1/3] tty notifier
@@ -26,7 +26,7 @@ index 3141dd3..9be342e 100644
endmenu
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
-index a42c466..38f2d7b 100644
+index 6da962c..1f77159 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -154,6 +154,90 @@ static void release_tty(struct tty_struct *tty, int idx);
@@ -144,7 +144,7 @@ index a42c466..38f2d7b 100644
return tty;
fail_no_mem:
-@@ -1474,6 +1568,10 @@ static void release_tty(struct tty_struct *tty, int idx)
+@@ -1476,6 +1570,10 @@ static void release_tty(struct tty_struct *tty, int idx)
/* This should always be true but check for the moment */
WARN_ON(tty->index != idx);
@@ -155,7 +155,7 @@ index a42c466..38f2d7b 100644
if (tty->link)
tty_kref_put(tty->link);
tty_kref_put(tty);
-@@ -1703,6 +1801,11 @@ int tty_release(struct inode *inode, struct file *filp)
+@@ -1705,6 +1803,11 @@ int tty_release(struct inode *inode, struct file *filp)
#ifdef TTY_DEBUG_HANGUP
printk(KERN_DEBUG "freeing tty structure...");
#endif
@@ -167,7 +167,7 @@ index a42c466..38f2d7b 100644
/*
* Ask the line discipline code to release its structures
*/
-@@ -2768,6 +2871,9 @@ void initialize_tty_struct(struct tty_struct *tty,
+@@ -2770,6 +2873,9 @@ void initialize_tty_struct(struct tty_struct *tty,
spin_lock_init(&tty->read_lock);
spin_lock_init(&tty->ctrl_lock);
INIT_LIST_HEAD(&tty->tty_files);
diff --git a/kernel/0002-gennl-changes-adding-non-locking-multicast-functions.patch b/kernel/0002-gennl-changes-adding-non-locking-multicast-functions.patch
index 760bd83..1fc45e4 100644
--- a/kernel/0002-gennl-changes-adding-non-locking-multicast-functions.patch
+++ b/kernel/0002-gennl-changes-adding-non-locking-multicast-functions.patch
@@ -1,4 +1,4 @@
-From 4c9ff9c9e46ea60fa8505697e5d43e943e7e44fb Mon Sep 17 00:00:00 2001
+From a234b5fd654474b10f344fc01e4de22b827c4c00 Mon Sep 17 00:00:00 2001
From: jolsa@redhat.com <jolsa@redhat.com>
Date: Thu, 25 Mar 2010 08:59:04 +0100
Subject: [PATCH 2/3] gennl changes - adding non locking multicast functions
diff --git a/kernel/0003-alive.patch b/kernel/0003-alive.patch
index c858653..7e00ba1 100644
--- a/kernel/0003-alive.patch
+++ b/kernel/0003-alive.patch
@@ -1,4 +1,4 @@
-From f1769465b8deb4d764fa1131b3d34d2d7f238e94 Mon Sep 17 00:00:00 2001
+From b9a1b1faaeece7956b59ade53aa808bedf1d2087 Mon Sep 17 00:00:00 2001
From: jolsa@redhat.com <jolsa@redhat.com>
Date: Tue, 30 Mar 2010 10:41:56 +0200
Subject: [PATCH 3/3] alive
@@ -910,7 +910,7 @@ index 0000000..a076f1c
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
-index 38f2d7b..11924dc 100644
+index 1f77159..15a6ad6 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -159,6 +159,35 @@ static LIST_HEAD(tty_structs); /* linked list of tty structs */