| .. | .. |
|---|
| 16 | 16 | #include <linux/sched.h> |
|---|
| 17 | 17 | #include <linux/init.h> |
|---|
| 18 | 18 | #include <linux/vmalloc.h> |
|---|
| 19 | | -#include <linux/bootmem.h> |
|---|
| 19 | +#include <linux/memblock.h> |
|---|
| 20 | 20 | |
|---|
| 21 | 21 | #include <asm/ptrace.h> |
|---|
| 22 | 22 | #include <asm/smp.h> |
|---|
| 23 | | -#include <asm/pgalloc.h> |
|---|
| 24 | 23 | #include <asm/tlbflush.h> |
|---|
| 25 | 24 | #include <asm/vga.h> |
|---|
| 26 | 25 | |
|---|
| .. | .. |
|---|
| 316 | 315 | * Window 1 is direct access 1GB at 2GB |
|---|
| 317 | 316 | * Window 2 is scatter-gather 1GB at 3GB |
|---|
| 318 | 317 | */ |
|---|
| 319 | | - hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, 0); |
|---|
| 318 | + hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, |
|---|
| 319 | + SMP_CACHE_BYTES); |
|---|
| 320 | 320 | hose->sg_isa->align_entry = 8; /* 64KB for ISA */ |
|---|
| 321 | 321 | |
|---|
| 322 | | - hose->sg_pci = iommu_arena_new(hose, 0xc0000000, 0x40000000, 0); |
|---|
| 322 | + hose->sg_pci = iommu_arena_new(hose, 0xc0000000, 0x40000000, |
|---|
| 323 | + SMP_CACHE_BYTES); |
|---|
| 323 | 324 | hose->sg_pci->align_entry = 4; /* Titan caches 4 PTEs at a time */ |
|---|
| 324 | 325 | |
|---|
| 325 | 326 | port->wsba[0].csr = hose->sg_isa->dma_base | 3; |
|---|