Changeset ef67bab in mainline for generic/src/mm/page.c

Timestamp:

2006-02-01T00:02:16Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

071a8ae6

Parents:

fc1e4f6

Message:

Memory management work.
Remove the last (i.e. 'root') argument from page_mapping_insert() and page_mapping_find().
Page table address is now extracted from the first (i.e. 'as') argument.
Add a lot of infrastructure to make the above possible.
sparc64 is now broken, most likely because of insufficient identity mapping of physical memory.

File:

• generic/src/mm/page.c (modified) (4 diffs)

generic/src/mm/page.c

@@ -49 +49 @@
 {
         page_arch_init();
-        page_mapping_insert(AS_KERNEL, 0x0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -69 +68 @@
 
         for (i = 0; i < cnt; i++)
-                page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+                page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE);
 
 }
@@ -78 +77 @@
  * using 'flags'. Allocate and setup any missing page tables.
  *
- * @param as Address space to wich page belongs. Must be locked prior the call.
+ * The address space must be locked and interrupts must be disabled.
+ *
+ * @param as Address space to wich page belongs..
  * @param page Virtual address of the page to be mapped.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
- * @param root Explicit PTL0 address.
  */
-void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
+void page_mapping_insert(as_t *as, __address page, __address frame, int flags)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_insert);
         
-        page_operations->mapping_insert(as, page, frame, flags, root);
+        page_operations->mapping_insert(as, page, frame, flags);
 }
 
@@ -96 +96 @@
  * Find mapping for virtual page.
  *
- * @param as Address space to wich page belongs must be locked prior the call.
+ * The address space must be locked and interrupts must be disabled.
+ *
+ * @param as Address space to wich page belongs.
  * @param page Virtual page.
- * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *page_mapping_find(as_t *as, __address page, __address root)
+pte_t *page_mapping_find(as_t *as, __address page)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_find);
 
-        return page_operations->mapping_find(as, page, root);
+        return page_operations->mapping_find(as, page);
 }