Changeset 1c7a170 in mainline for kernel/arch/ia32/src/smp/smp.c

Timestamp:

2018-03-27T16:49:29Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

f303afc6 (diff), 94d211e (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-27 16:49:29)

git-committer:

GitHub <noreply@…> (2018-03-27 16:49:29)

Message:

Merge 94d211e1f212626c420cf42c22b056ac1db9c0f1 into f303afc69bfdfc798071487501f775a7c4d8c475

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (1 diff)

kernel/arch/ia32/src/smp/smp.c

@@ -75 +75 @@
 
         if (config.cpu_count > 1) {
-                l_apic = (uint32_t *) km_map((uintptr_t) l_apic, PAGE_SIZE,
-                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
-                io_apic = (uint32_t *) km_map((uintptr_t) io_apic, PAGE_SIZE,
-                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
+                l_apic = (uint32_t *) km_map((uintptr_t) l_apic,
+                    PAGE_SIZE,
+                    PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
+                io_apic = (uint32_t *) km_map((uintptr_t) io_apic,
+                    PAGE_SIZE,
+                    PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
         }
 }