diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-10-26 18:23:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-10-26 21:03:18 -0400 |
| commit | 34f9218fe519cd922889076cc7698bd73bdb9f92 (patch) | |
| tree | 50217145a1dd12d404471d7c32f1093ffdc916b7 /epoll-limit-paths.patch | |
| parent | 829bffe3f94cfbe50c418900af3d6eb9df27d59e (diff) | |
| download | kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.gz kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.xz kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.zip | |
Linux 3.1-git1 (138c4ae9cfda upstream)
First take on the upcomming Linux 3.2 kernel. The moving of the ethernet
drivers into vendor subdirectories caused a lot of churn in config-generic, but
hopefully it's a bit cleaner now.
Diffstat (limited to 'epoll-limit-paths.patch')
| -rw-r--r-- | epoll-limit-paths.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epoll-limit-paths.patch b/epoll-limit-paths.patch index 440db27b9..4ed306af4 100644 --- a/epoll-limit-paths.patch +++ b/epoll-limit-paths.patch @@ -1,4 +1,4 @@ -From 6a4ca79652219cf22da800d990e5b46feaea1ad9 Mon Sep 17 00:00:00 2001 +From 0a6cc45426fe3baaf231efd7efe4300fd879efc8 Mon Sep 17 00:00:00 2001 From: Jason Baron <jbaron@redhat.com> Date: Mon, 24 Oct 2011 14:59:02 +1100 Subject: [PATCH] epoll: limit paths @@ -91,7 +91,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> 3 files changed, 203 insertions(+), 25 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c -index 4a53743..414ac74 100644 +index b84fad9..414ac74 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -197,6 +197,12 @@ struct eventpoll { @@ -137,7 +137,7 @@ index 4a53743..414ac74 100644 .llseek = noop_llseek, }; --/* Fast test to see if the file is an evenpoll file */ +-/* Fast test to see if the file is an eventpoll file */ -static inline int is_file_epoll(struct file *f) -{ - return f->f_op == &eventpoll_fops; @@ -449,7 +449,7 @@ index f362733..657ab55 100644 diff --git a/include/linux/fs.h b/include/linux/fs.h -index 277f497..93778e0 100644 +index ba98668..d393a68 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -985,6 +985,7 @@ struct file { |