Merge pull request #21 from 01org/fix

sergeay · web-flow · commit cec111a6eed0 · 2017-03-23T15:20:35.000+02:00
Removing BUG_ON macro call on isgx_eremove() failure
diff --git a/isgx_page_cache.c b/isgx_page_cache.c
@@ -479,7 +479,7 @@ void isgx_free_epc_page(struct isgx_epc_page *entry,
 	}
 
 	if (flags & ISGX_FREE_EREMOVE)
-		BUG_ON(isgx_eremove(entry));
+		isgx_eremove(entry);
 
 	spin_lock(&isgx_free_list_lock);
 	list_add(&entry->free_list, &isgx_free_list);
diff --git a/isgx_util.c b/isgx_util.c
@@ -84,7 +84,7 @@ int isgx_eremove(struct isgx_epc_page *epc_page)
 	isgx_put_epc_page(epc);
 
 	if (ret)
-		pr_debug_ratelimited("EREMOVE returned %d\n", ret);
+		pr_err("EREMOVE returned %d\n", ret);
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ void isgx_free_epc_page(struct isgx_epc_page *entry,`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`if (flags & ISGX_FREE_EREMOVE)`
`482`		`- BUG_ON(isgx_eremove(entry));`
	`482`	`+ isgx_eremove(entry);`
`483`	`483`
`484`	`484`	`spin_lock(&isgx_free_list_lock);`
`485`	`485`	`list_add(&entry->free_list, &isgx_free_list);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ int isgx_eremove(struct isgx_epc_page *epc_page)`
`84`	`84`	`isgx_put_epc_page(epc);`
`85`	`85`
`86`	`86`	`if (ret)`
`87`		`- pr_debug_ratelimited("EREMOVE returned %d\n", ret);`
	`87`	`+ pr_err("EREMOVE returned %d\n", ret);`
`88`	`88`
`89`	`89`	`return ret;`
`90`	`90`	`}`