Changeset 1c7a170 in mainline for kernel/genarch/src/acpi/acpi.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/genarch/src/acpi/acpi.c

    rf303afc6 r1c7a170  
    104104        /* Start with mapping the header only. */
    105105        vhdr = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
    106             sizeof(struct acpi_sdt_header), PAGE_READ | PAGE_NOT_CACHEABLE);
     106            sizeof(struct acpi_sdt_header),
     107            PAGE_READ_ONLY | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
    107108
    108109        /* Now we can map the entire structure. */
    109110        vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
    110             vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE);
     111            vhdr->length,
     112            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
    111113
    112114        // TODO: do not leak vtmp
Note: See TracChangeset for help on using the changeset viewer.