diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-05 16:03:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 08:42:40 +0100 |
| commit | 50d34394cee68dd12c5e01fff073d1167700bfce (patch) | |
| tree | 988adde268b206019649eae4a059660faacf358f | |
| parent | 0881e7bd341e2158b314596bcf2059e88e68f04e (diff) | |
| download | op-kernel-dev-50d34394cee68dd12c5e01fff073d1167700bfce.zip op-kernel-dev-50d34394cee68dd12c5e01fff073d1167700bfce.tar.gz | |
sched/headers: Prepare to remove the <linux/magic.h> include from <linux/sched/task_stack.h>
Update files that depend on the magic.h inclusion.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | drivers/dax/dax.c | 1 | ||||
| -rw-r--r-- | drivers/virtio/virtio_balloon.c | 1 | ||||
| -rw-r--r-- | include/linux/sched/task_stack.h | 1 | ||||
| -rw-r--r-- | mm/zsmalloc.c | 1 | ||||
| -rw-r--r-- | security/integrity/evm/evm_main.c | 2 |
5 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index b75c772..8d9829f 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/magic.h> #include <linux/mount.h> #include <linux/pfn_t.h> #include <linux/hash.h> diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 9d2738e..a610061 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -31,6 +31,7 @@ #include <linux/wait.h> #include <linux/mm.h> #include <linux/mount.h> +#include <linux/magic.h> /* * Balloon device works in 4K page units. So each page is pointed to by diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h index 933cd49..d2d578e 100644 --- a/include/linux/sched/task_stack.h +++ b/include/linux/sched/task_stack.h @@ -2,5 +2,6 @@ #define _LINUX_SCHED_TASK_STACK_H #include <linux/sched.h> +#include <linux/magic.h> #endif /* _LINUX_SCHED_TASK_STACK_H */ diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index b7b1fb6..b7ee9c3 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -33,6 +33,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/magic.h> #include <linux/bitops.h> #include <linux/errno.h> #include <linux/highmem.h> diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index e2ed498..063d38a 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -22,6 +22,8 @@ #include <linux/xattr.h> #include <linux/integrity.h> #include <linux/evm.h> +#include <linux/magic.h> + #include <crypto/hash.h> #include <crypto/algapi.h> #include "evm.h" |
