patch-2.1.115 linux/ipc/shm.c

• Lines: 18
• Date: Tue Aug 4 16:49:19 1998
• Orig file: v2.1.114/linux/ipc/shm.c
• Orig date: Tue Jun 23 10:01:30 1998

diff -u --recursive --new-file v2.1.114/linux/ipc/shm.c linux/ipc/shm.c
@@ -726,7 +726,7 @@
 static unsigned long swap_id = 0; /* currently being swapped */
 static unsigned long swap_idx = 0; /* next to swap */
 
-int shm_swap (int prio, int dma)
+int shm_swap (int prio, int gfp_mask)
 {
 	pte_t page;
 	struct shmid_ds *shp;
@@ -763,7 +763,7 @@
 	page = __pte(shp->shm_pages[idx]);
 	if (!pte_present(page))
 		goto check_table;
-	if (dma && !PageDMA(&mem_map[MAP_NR(pte_page(page))]))
+	if ((gfp_mask & __GFP_DMA) && !PageDMA(&mem_map[MAP_NR(pte_page(page))]))
 		goto check_table;
 	swap_attempts++;