Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit aa0ac36518be648dda3a32f0b37a8b2b546e1b24

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent cb510b8172
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Remove capability.h from mm.h 

I forgot to remove capability.h from mm.h while removing sched.h!  This
patch remedies that, because the only inline function which was using
CAP_something was made out of line.

Cross-compile tested without regressions on:

	all powerpc defconfigs
	all mips defconfigs
	all m68k defconfigs
	all arm defconfigs
	all ia64 defconfigs

	alpha alpha-allnoconfig alpha-defconfig alpha-up
	arm
	i386 i386-allnoconfig i386-defconfig i386-up
	ia64 ia64-allnoconfig ia64-defconfig ia64-up
	m68k
	mips
	parisc parisc-allnoconfig parisc-defconfig parisc-up
	powerpc powerpc-up
	s390 s390-allnoconfig s390-defconfig s390-up
	sparc sparc-allnoconfig sparc-defconfig sparc-up
	sparc64 sparc64-allnoconfig sparc64-defconfig sparc64-up
	um-x86_64
	x86_64 x86_64-allnoconfig x86_64-defconfig x86_64-up

as well as my two usual configs.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 5 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/pci/pci-sysfs.c
Diff comments   View file @ aa0ac36
... ... @@ -20,7 +20,7 @@
20 20 #include <linux/stat.h>
21 21 #include <linux/topology.h>
22 22 #include <linux/mm.h>
23   -
  23 +#include <linux/capability.h>
24 24 #include "pci.h"
25 25  
26 26 static int sysfs_initialized; /* = 0 */
... ... @@ -11,7 +11,7 @@
11 11 #include <linux/module.h>
12 12 #include <linux/proc_fs.h>
13 13 #include <linux/seq_file.h>
14   -
  14 +#include <linux/capability.h>
15 15 #include <asm/uaccess.h>
16 16 #include <asm/byteorder.h>
17 17 #include "pci.h"
... ... @@ -11,6 +11,7 @@
11 11 #include <linux/spinlock.h>
12 12 #include <linux/completion.h>
13 13 #include <linux/buffer_head.h>
  14 +#include <linux/capability.h>
14 15 #include <linux/xattr.h>
15 16 #include <linux/gfs2_ondisk.h>
16 17 #include <linux/lm_interface.h>
... ... @@ -2,7 +2,6 @@
2 2 #define _LINUX_MM_H
3 3  
4 4 #include <linux/errno.h>
5   -#include <linux/capability.h>
6 5  
7 6 #ifdef __KERNEL__
8 7  
... ... @@ -13,7 +13,7 @@
13 13 #include <linux/timex.h>
14 14 #include <linux/jiffies.h>
15 15 #include <linux/hrtimer.h>
16   -
  16 +#include <linux/capability.h>
17 17 #include <asm/div64.h>
18 18 #include <asm/timex.h>
19 19