diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 11:50:22 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 11:50:22 +0530 |
| commit | 395ae9f4e6934c9f61d7002dc12b267d0c302104 (patch) | |
| tree | d80d145feb56614796dfe6c2ce41db16b290daf3 /arch/alpha | |
| parent | 317c5652a7c300c2d82ef5bfae8d3558f389d219 (diff) | |
| parent | 13b48cd3ac945d4e4075bec53f107a315fe771ae (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
kernel/fork.c
Conflict due to Kaiser implementation in LTS 4.4.110.
net/ipv4/raw.c
Minor conflict due to LTS commit
be27b620a861 ("net: ipv4: fix for a race condition in raw_sendmsg")
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/mmu_context.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/mmu_context.h b/arch/alpha/include/asm/mmu_context.h index 4c51c05333c6..4cafffa80e2c 100644 --- a/arch/alpha/include/asm/mmu_context.h +++ b/arch/alpha/include/asm/mmu_context.h @@ -7,6 +7,7 @@ * Copyright (C) 1996, Linus Torvalds */ +#include <linux/sched.h> #include <asm/machvec.h> #include <asm/compiler.h> #include <asm-generic/mm_hooks.h> |