Changeset 6be2c13 in mainline for kernel/arch/sparc64/src/drivers/pci.c

Timestamp:

2018-03-16T20:58:20Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

973be387 (diff), 4b1c7c6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-16 20:58:20)

git-committer:

GitHub <noreply@…> (2018-03-16 20:58:20)

Message:

Merge 4b1c7c6ff1e7b982f389a8f841b71af2a85e8cfb into 973be38782462a672111ff6833f8dbb40d2a44bf

File:

• kernel/arch/sparc64/src/drivers/pci.c (modified) (2 diffs)

kernel/arch/sparc64/src/drivers/pci.c

@@ -110 +110 @@
         pci->op = &pci_sabre_ops;
         pci->reg = (uint64_t *) km_map(paddr, reg[SABRE_INTERNAL_REG].size,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_WRITE);
 
         return pci;
@@ -152 +152 @@
         pci->op = &pci_psycho_ops;
         pci->reg = (uint64_t *) km_map(paddr, reg[PSYCHO_INTERNAL_REG].size,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_WRITE);
 
         return pci;