patch-1.3.22 linux/ipc/shm.c

Next file: linux/kernel/exit.c
Previous file: linux/init/main.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.21/linux/ipc/shm.c linux/ipc/shm.c
@@ -442,7 +442,7 @@
 		page_table = pte_alloc(page_middle,tmp);
 		if (!page_table)
 			return -ENOMEM;
-		pte_val(*page_table) = shm_sgn;
+		set_pte(page_table, __pte(shm_sgn));
 	}
 	invalidate();
 	return 0;
@@ -757,13 +757,13 @@
 		if (!pte_present(pte))
 			continue;
 		if (pte_young(pte)) {
-			*page_table = pte_mkold(pte);
+			set_pte(page_table, pte_mkold(pte));
 			continue;
 		}
 		if (pte_page(pte) != pte_page(page))
 			printk("shm_swap_out: page and pte mismatch\n");
-		pte_val(*page_table) =
-		  shmd->vm_pte + SWP_ENTRY(0, idx << SHM_IDX_SHIFT);
+		set_pte(page_table,
+		  __pte(shmd->vm_pte + SWP_ENTRY(0, idx << SHM_IDX_SHIFT)));
 		mem_map[MAP_NR(pte_page(pte))]--;
 		if (shmd->vm_task->mm->rss > 0)
 			shmd->vm_task->mm->rss--;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this