← Back to branch summary

~martin-decky/helenos/rcu

« back to all changes in this revision

Viewing changes to kernel/generic/src/mm/as.c

  • Committer: Jakub Jermar
  • Date: 2011-05-22 20:05:26 UTC
  • mfrom: (825.1.37 HelenOS.mm)
  • Revision ID: jakub@jermar.eu-20110522200526-pxq8rvwyusft0cff
Merge from lp:~jakub/helenos/mm.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/generic/src/mm/as.c
648
648
                                
649
649
                                for (; i < size; i++) {
650
650
                                        pte_t *pte = page_mapping_find(as,
651
 
                                            ptr + P2SZ(i));
 
651
                                            ptr + P2SZ(i), false);
652
652
                                        
653
653
                                        ASSERT(pte);
654
654
                                        ASSERT(PTE_VALID(pte));
797
797
                        
798
798
                        for (size = 0; size < (size_t) node->value[i]; size++) {
799
799
                                pte_t *pte = page_mapping_find(as,
800
 
                                     ptr + P2SZ(size));
 
800
                                     ptr + P2SZ(size), false);
801
801
                                
802
802
                                ASSERT(pte);
803
803
                                ASSERT(PTE_VALID(pte));
1104
1104
                        
1105
1105
                        for (size = 0; size < (size_t) node->value[i]; size++) {
1106
1106
                                pte_t *pte = page_mapping_find(as,
1107
 
                                    ptr + P2SZ(size));
 
1107
                                    ptr + P2SZ(size), false);
1108
1108
                                
1109
1109
                                ASSERT(pte);
1110
1110
                                ASSERT(PTE_VALID(pte));
1240
1240
         * we need to make sure the mapping has not been already inserted.
1241
1241
         */
1242
1242
        pte_t *pte;
1243
 
        if ((pte = page_mapping_find(AS, page))) {
 
1243
        if ((pte = page_mapping_find(AS, page, false))) {
1244
1244
                if (PTE_PRESENT(pte)) {
1245
1245
                        if (((access == PF_ACCESS_READ) && PTE_READABLE(pte)) ||
1246
1246
                            (access == PF_ACCESS_WRITE && PTE_WRITABLE(pte)) ||