forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into core/percpu

Browse source 
Conflicts:
	kernel/irq/handle.c
This commit is contained in:
Ingo Molnar 2009-01-30 18:23:30 +01:00
commit c43e0e46ad
293 changed files with 10178 additions and 4209 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/sched.h
View file

@ -630,7 +630,6 @@ struct user_struct {
atomic_t inotify_devs; /* How many inotify devs does this user have opened? */
#endif
#ifdef CONFIG_EPOLL
atomic_t epoll_devs; /* The number of epoll descriptors currently open */
atomic_t epoll_watches; /* The number of file descriptors currently watched */
#endif
#ifdef CONFIG_POSIX_MQUEUE