Changeset da3e227 in mainline


Ignore:
Timestamp:
2009-09-05T18:40:25Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
de48286
Parents:
b53e6d9 (diff), 8b4cfb9d (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 ia64 fixes.

Location:
kernel/arch/ia64
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/include/asm.h

    rb53e6d9 rda3e227  
    422422        asm volatile (
    423423                "rsm %[mask]\n"
     424                ";;\n"
     425                "srlz.d\n"
    424426                :: [mask] "i" (PSR_PK_MASK)
    425427        );
  • kernel/arch/ia64/src/mm/as.c

    rb53e6d9 rda3e227  
    7373                rr.map.ps = PAGE_WIDTH;
    7474                rr_write(i, rr.word);
     75                srlz_d();
     76                srlz_i();
    7577        }
    76         srlz_d();
    77         srlz_i();
    7878}
    7979
Note: See TracChangeset for help on using the changeset viewer.