Changeset 06b0211b in mainline for kernel/generic/src/mm/as.c

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (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:

• kernel/generic/src/mm/as.c (modified) (7 diffs)

kernel/generic/src/mm/as.c

@@ -544 +544 @@
     mem_backend_data_t *backend_data, uintptr_t *base, uintptr_t bound)
 {
-        if ((*base != (uintptr_t) -1) && ((*base % PAGE_SIZE) != 0))
+        if ((*base != (uintptr_t) -1) && !IS_ALIGNED(*base, PAGE_SIZE))
                 return NULL;
         
@@ -688 +688 @@
 int as_area_resize(as_t *as, uintptr_t address, size_t size, unsigned int flags)
 {
+        if (!IS_ALIGNED(address, PAGE_SIZE))
+                return EINVAL;
+
         mutex_lock(&as->lock);
         
@@ -1350 +1353 @@
  * Interrupts are assumed disabled.
  *
- * @param page   Faulting page.
- * @param access Access mode that caused the page fault (i.e.
- *               read/write/exec).
- * @param istate Pointer to the interrupted state.
+ * @param address Faulting address.
+ * @param access  Access mode that caused the page fault (i.e.
+ *                read/write/exec).
+ * @param istate  Pointer to the interrupted state.
  *
  * @return AS_PF_FAULT on page fault.
@@ -1361 +1364 @@
  *
  */
-int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
-{
+int as_page_fault(uintptr_t address, pf_access_t access, istate_t *istate)
+{
+        uintptr_t page = ALIGN_DOWN(address, PAGE_SIZE);
         int rc = AS_PF_FAULT;
 
@@ -1452 +1456 @@
                 task_kill_self(true);
         } else {
-                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
-                panic_memtrap(istate, access, page, NULL);
+                fault_if_from_uspace(istate, "Page fault: %p.", (void *) address);
+                panic_memtrap(istate, access, address, NULL);
         }
         
@@ -1679 +1683 @@
 {
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
+        ASSERT(IS_ALIGNED(page, PAGE_SIZE));
         ASSERT(count);
         
@@ -1963 +1967 @@
 {
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
+        ASSERT(IS_ALIGNED(page, PAGE_SIZE));
         ASSERT(count);