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/cris/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/cris/mm/init.c')
| -rw-r--r-- | arch/cris/mm/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index df33ab89d70f..d72ab58fd83e 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c | |||
| @@ -13,8 +13,6 @@ | |||
| 13 | #include <linux/bootmem.h> | 13 | #include <linux/bootmem.h> |
| 14 | #include <asm/tlb.h> | 14 | #include <asm/tlb.h> |
| 15 | 15 | ||
| 16 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
| 17 | |||
| 18 | unsigned long empty_zero_page; | 16 | unsigned long empty_zero_page; |
| 19 | 17 | ||
| 20 | extern char _stext, _edata, _etext; /* From linkerscript */ | 18 | extern char _stext, _edata, _etext; /* From linkerscript */ |