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/drivers/am335x/timer.c

    rf303afc6 r1c7a170  
    100100        size = regs_map[id].size;
    101101
    102         timer->regs = (void *) km_map(base_addr, size, PAGE_NOT_CACHEABLE);
     102        timer->regs = (void *) km_map(base_addr, size,
     103            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
    103104        assert(timer->regs != NULL);
    104105
Note: See TracChangeset for help on using the changeset viewer.