diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /mm/init-mm.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'mm/init-mm.c')
-rw-r--r-- | mm/init-mm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/init-mm.c b/mm/init-mm.c index 1d29cdfe8ebb..4019979b2637 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c | |||
@@ -21,6 +21,5 @@ struct mm_struct init_mm = { | |||
21 | .mmap_sem = __RWSEM_INITIALIZER(init_mm.mmap_sem), | 21 | .mmap_sem = __RWSEM_INITIALIZER(init_mm.mmap_sem), |
22 | .page_table_lock = __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock), | 22 | .page_table_lock = __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock), |
23 | .mmlist = LIST_HEAD_INIT(init_mm.mmlist), | 23 | .mmlist = LIST_HEAD_INIT(init_mm.mmlist), |
24 | .cpu_vm_mask = CPU_MASK_ALL, | ||
25 | INIT_MM_CONTEXT(init_mm) | 24 | INIT_MM_CONTEXT(init_mm) |
26 | }; | 25 | }; |