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

Merge branch 'linus' into cpus4096

Browse source 
Conflicts:
	kernel/trace/ring_buffer.c
This commit is contained in:
Ingo Molnar 2008-12-02 20:09:50 +01:00
commit a64d31baed
286 changed files with 5510 additions and 2652 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/sched.h
View file

@ -628,6 +628,10 @@ struct user_struct {
atomic_t inotify_watches; /* How many inotify watches does this user have? */
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
/* protected by mq_lock */
unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */