Changeset 25

Timestamp:

01/05/06 10:25:50 (6 years ago)

Author:

dkaplan1

Message:

Fixed bug with marking pages as reserved. Now only mark pages as reserved during the length of remap_page_range (which fails if PageReserved? is false), and preserve old setting. Old code would cause occasional bug checks in mm/rmap.c:343

Files:

• arch/i386/kernel/callgate.c (modified) (3 diffs)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -111 +111 @@
-        return tsk->currentaddr;
-    }
+    if (!tsk->ring)
+        return current;
-    tsk->currentaddr=(struct task_struct*) map_struct(tsk, sizeof(*tsk)+PAGE_SIZE, tsk->ring, &tsk->origcurrentaddr);
-    tsk->currentmapped=1;
@@ -449 +451 @@
-    struct vm_area_struct *vma;
-    unsigned long addr=0;
+    int res1, res2;
-    if (!kernel_struct || !size)
-        return -EINVAL;
@@ -465 +468 @@
-    
-    vma->vm_mm=&init_mm;
-
-
-
+
+
+
+
+
+
-    remap_page_range(vma, addr, __pa(kernel_struct), size, PAGE_KERNEL);
+    if (!res1)    
+        ClearPageReserved(pfn_to_page(__pa(kernel_struct) >> PAGE_SHIFT));
+    if (!res2)
+        ClearPageReserved(pfn_to_page((__pa(kernel_struct) >> PAGE_SHIFT) + 1));
-    addr+=(unsigned long) kernel_struct & (PAGE_SIZE -1);
-    

.version

@@ -1 @@
-4
+7