diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2007-05-20 17:22:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 12:18:19 -0400 |
commit | e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 (patch) | |
tree | fc86c863655128a7041dfe613d14393d761fa7b9 /include/linux | |
parent | ff1be9ad61e3e17ba83702d8ed0b534e5b8ee15c (diff) |
Detach sched.h from mm.h
First thing mm.h does is including sched.h solely for can_do_mlock() inline
function which has "current" dereference inside. By dealing with can_do_mlock()
mm.h can be detached from sched.h which is good. See below, why.
This patch
a) removes unconditional inclusion of sched.h from mm.h
b) makes can_do_mlock() normal function in mm/mlock.c
c) exports can_do_mlock() to not break compilation
d) adds sched.h inclusions back to files that were getting it indirectly.
e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were
getting them indirectly
Net result is:
a) mm.h users would get less code to open, read, preprocess, parse, ... if
they don't need sched.h
b) sched.h stops being dependency for significant number of files:
on x86_64 allmodconfig touching sched.h results in recompile of 4083 files,
after patch it's only 3744 (-8.3%).
Cross-compile tested on
all arm defconfigs, all mips defconfigs, all powerpc defconfigs,
alpha alpha-up
arm
i386 i386-up i386-defconfig i386-allnoconfig
ia64 ia64-up
m68k
mips
parisc parisc-up
powerpc powerpc-up
s390 s390-up
sparc sparc-up
sparc64 sparc64-up
um-x86_64
x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig
as well as my two usual configs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mm.h | 11 | ||||
-rw-r--r-- | include/linux/smb_fs.h | 1 | ||||
-rw-r--r-- | include/linux/task_io_accounting_ops.h | 2 | ||||
-rw-r--r-- | include/linux/writeback.h | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 4670ebd1f622..e4183c6c7de3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_MM_H | 1 | #ifndef _LINUX_MM_H |
2 | #define _LINUX_MM_H | 2 | #define _LINUX_MM_H |
3 | 3 | ||
4 | #include <linux/sched.h> | ||
5 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
6 | #include <linux/capability.h> | 5 | #include <linux/capability.h> |
7 | 6 | ||
@@ -20,6 +19,7 @@ | |||
20 | 19 | ||
21 | struct mempolicy; | 20 | struct mempolicy; |
22 | struct anon_vma; | 21 | struct anon_vma; |
22 | struct user_struct; | ||
23 | 23 | ||
24 | #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ | 24 | #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ |
25 | extern unsigned long max_mapnr; | 25 | extern unsigned long max_mapnr; |
@@ -717,14 +717,7 @@ extern unsigned long shmem_get_unmapped_area(struct file *file, | |||
717 | unsigned long flags); | 717 | unsigned long flags); |
718 | #endif | 718 | #endif |
719 | 719 | ||
720 | static inline int can_do_mlock(void) | 720 | extern int can_do_mlock(void); |
721 | { | ||
722 | if (capable(CAP_IPC_LOCK)) | ||
723 | return 1; | ||
724 | if (current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur != 0) | ||
725 | return 1; | ||
726 | return 0; | ||
727 | } | ||
728 | extern int user_shm_lock(size_t, struct user_struct *); | 721 | extern int user_shm_lock(size_t, struct user_struct *); |
729 | extern void user_shm_unlock(size_t, struct user_struct *); | 722 | extern void user_shm_unlock(size_t, struct user_struct *); |
730 | 723 | ||
diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h index 13b3af547864..6b51a48e8995 100644 --- a/include/linux/smb_fs.h +++ b/include/linux/smb_fs.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #ifndef _LINUX_SMB_FS_H | 9 | #ifndef _LINUX_SMB_FS_H |
10 | #define _LINUX_SMB_FS_H | 10 | #define _LINUX_SMB_FS_H |
11 | 11 | ||
12 | #include <linux/jiffies.h> | ||
12 | #include <linux/smb.h> | 13 | #include <linux/smb.h> |
13 | 14 | ||
14 | /* | 15 | /* |
diff --git a/include/linux/task_io_accounting_ops.h b/include/linux/task_io_accounting_ops.h index 1218733ec6b5..ff46c6fad79d 100644 --- a/include/linux/task_io_accounting_ops.h +++ b/include/linux/task_io_accounting_ops.h | |||
@@ -4,6 +4,8 @@ | |||
4 | #ifndef __TASK_IO_ACCOUNTING_OPS_INCLUDED | 4 | #ifndef __TASK_IO_ACCOUNTING_OPS_INCLUDED |
5 | #define __TASK_IO_ACCOUNTING_OPS_INCLUDED | 5 | #define __TASK_IO_ACCOUNTING_OPS_INCLUDED |
6 | 6 | ||
7 | #include <linux/sched.h> | ||
8 | |||
7 | #ifdef CONFIG_TASK_IO_ACCOUNTING | 9 | #ifdef CONFIG_TASK_IO_ACCOUNTING |
8 | static inline void task_io_account_read(size_t bytes) | 10 | static inline void task_io_account_read(size_t bytes) |
9 | { | 11 | { |
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 050915b59576..4ef4d22e5e43 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
@@ -4,6 +4,8 @@ | |||
4 | #ifndef WRITEBACK_H | 4 | #ifndef WRITEBACK_H |
5 | #define WRITEBACK_H | 5 | #define WRITEBACK_H |
6 | 6 | ||
7 | #include <linux/sched.h> | ||
8 | |||
7 | struct backing_dev_info; | 9 | struct backing_dev_info; |
8 | 10 | ||
9 | extern spinlock_t inode_lock; | 11 | extern spinlock_t inode_lock; |