hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/alpha/kernel/core_titan.c
....@@ -16,11 +16,10 @@
1616 #include <linux/sched.h>
1717 #include <linux/init.h>
1818 #include <linux/vmalloc.h>
19
-#include <linux/bootmem.h>
19
+#include <linux/memblock.h>
2020
2121 #include <asm/ptrace.h>
2222 #include <asm/smp.h>
23
-#include <asm/pgalloc.h>
2423 #include <asm/tlbflush.h>
2524 #include <asm/vga.h>
2625
....@@ -316,10 +315,12 @@
316315 * Window 1 is direct access 1GB at 2GB
317316 * Window 2 is scatter-gather 1GB at 3GB
318317 */
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);
320320 hose->sg_isa->align_entry = 8; /* 64KB for ISA */
321321
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);
323324 hose->sg_pci->align_entry = 4; /* Titan caches 4 PTEs at a time */
324325
325326 port->wsba[0].csr = hose->sg_isa->dma_base | 3;