Re: [BUG] vmalloc_area_pages() in 2.4.2-ac25

[Andrew Morton]

Andrew Morton wrote:
> 
> Tachino Nobuhiro wrote:
> >
> >   vmalloc_area_pages() in 2.4.2-ac25 seems to be broken. It calls
> > spin_lock(&init_mm.page_table_lock) twice and causes system hang.
> >
> 
> Yes, it would.  Delete the innermost lock and unlock.
> 

And the other one.

--- linux-2.4.2-ac25/mm/vmalloc.c	Mon Mar 26 21:38:38 2001
+++ ac/mm/vmalloc.c	Mon Mar 26 22:49:29 2001
@@ -126,9 +126,7 @@
 	do {
 		pte_t * pte;
 
-		spin_lock(&init_mm.page_table_lock);	/* pte_alloc requires this */
 		pte = pte_alloc(&init_mm, pmd, address);
-		spin_unlock(&init_mm.page_table_lock);
 		if (!pte)
 			return -ENOMEM;
 		if (alloc_area_pte(pte, address, end - address, gfp_mask, prot))
@@ -152,9 +150,7 @@
 	do {
 		pmd_t *pmd;
 		
-		spin_lock(&init_mm.page_table_lock);	/* pmd_alloc requires this */
 		pmd = pmd_alloc(&init_mm, dir, address);
-		spin_unlock(&init_mm.page_table_lock);
 		ret = -ENOMEM;
 		if (!pmd)
 			break;