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/ia64/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/ia64/mm/init.c')
| -rw-r--r-- | arch/ia64/mm/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index ed41759efcac..00cb0e26c64e 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -36,8 +36,6 @@ | |||
| 36 | #include <asm/mca.h> | 36 | #include <asm/mca.h> |
| 37 | #include <asm/paravirt.h> | 37 | #include <asm/paravirt.h> |
| 38 | 38 | ||
| 39 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
| 40 | |||
| 41 | extern void ia64_tlb_init (void); | 39 | extern void ia64_tlb_init (void); |
| 42 | 40 | ||
| 43 | unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL; | 41 | unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL; |