Changeset 6be2c13 in mainline for kernel/arch/ia64/src/ia64.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/ia64/src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -106 +106 @@
 {
         uintptr_t IOSAPIC = km_map(iosapic_base, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_WRITE);
         int i;
 
@@ -135 +135 @@
                 /* Map the page with legacy I/O. */
                 legacyio_virt_base = km_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE,
-                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
+                    PAGE_WRITE);
 
                 iosapic_init();