Merge foobazco.org:/sources/2.5-bk

into foobazco.org:/sources/2.5-sparc-todave

Merge foobazco.org:/sources/2.5-bk
into foobazco.org:/sources/2.5-sparc-todave
69bacdf2 · Keith M. Wesolowski · ff9fc790 · 6e3eae38 · 69bacdf2
Commit 69bacdf2 authored Mar 05, 2004 by Keith M. Wesolowski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

arch/sparc/mm/srmmu.c arch/sparc/mm/srmmu.c +2 -1

No files found.
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -632,7 +632,8 @@ struct thread_info *srmmu_alloc_thread_info(void)
 	ret = (struct thread_info *)__get_free_pages(GFP_KERNEL,
 						     THREAD_INFO_ORDER);
 #ifdef CONFIG_DEBUG_STACK_USAGE
-	memset(ret, 0, PAGE_SIZE << THREAD_INFO_ORDER);
+	if (ret)
+		memset(ret, 0, PAGE_SIZE << THREAD_INFO_ORDER);
 #endif /* DEBUG_STACK_USAGE */

 	return ret;