Ignore:
Timestamp:
2014-09-12T13:22:33Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/include/arch/mm/page_armv6.h

    r8db09e4 r15d0046  
    258258        if (flags & PAGE_CACHEABLE) {
    259259                /*
    260                  * Write-through, no write-allocate memory, see ch. B3.8.2
     260                 * Write-through, write-allocate memory, see ch. B3.8.2
    261261                 * (p. B3-1358) of ARM Architecture reference manual.
    262262                 * Make sure the memory type is correct, and in sync with:
Note: See TracChangeset for help on using the changeset viewer.