diff options
| author | Tejun Heo <tj@kernel.org> | 2013-06-13 22:38:26 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-06-13 22:42:22 -0400 |
| commit | 2b0e53a7c8a6972755c0f0152d7fad2289fdc5eb (patch) | |
| tree | bf427cbe4b9d85cd5651b01f2f18668e8d12ed45 /arch/mips/kernel/proc.c | |
| parent | ea15f8ccdb430af1e8bc9b4e19a230eb4c356777 (diff) | |
| parent | dbece3a0f1ef0b19aff1cc6ed0942fec9ab98de1 (diff) | |
Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.11
This is to receive percpu_refcount which will replace atomic_t
reference count in cgroup_subsys_state.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/mips/kernel/proc.c')
| -rw-r--r-- | arch/mips/kernel/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index a3e461408b7e..acb34373679e 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <asm/bootinfo.h> | 10 | #include <asm/bootinfo.h> |
| 11 | #include <asm/cpu.h> | 11 | #include <asm/cpu.h> |
| 12 | #include <asm/cpu-features.h> | 12 | #include <asm/cpu-features.h> |
| 13 | #include <asm/idle.h> | ||
| 13 | #include <asm/mipsregs.h> | 14 | #include <asm/mipsregs.h> |
| 14 | #include <asm/processor.h> | 15 | #include <asm/processor.h> |
| 15 | #include <asm/prom.h> | 16 | #include <asm/prom.h> |