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 /arch/m32r/mm/init.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 'arch/m32r/mm/init.c')
| -rw-r--r-- | arch/m32r/mm/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 73e2205ebf5a..78b660e903da 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
| @@ -35,8 +35,6 @@ extern char __init_begin, __init_end; | |||
| 35 | 35 | ||
| 36 | pgd_t swapper_pg_dir[1024]; | 36 | pgd_t swapper_pg_dir[1024]; |
| 37 | 37 | ||
| 38 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
| 39 | |||
| 40 | /* | 38 | /* |
| 41 | * Cache of MMU context last used. | 39 | * Cache of MMU context last used. |
| 42 | */ | 40 | */ |