Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core

Conflicts: include/linux/ftrace.h
2008-12-19 09:42:40 +01:00
parent c71dd42db2 6d102bc68f 3d9101e925
commit 30cd324e97
234 changed files with 4196 additions and 2819 deletions
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -556,6 +556,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co
 		be = blk->start + blk->size;
 		if (s >= bs && e <= be)
 			break;
+		blk = NULL;
 	}

 	if (blk == NULL)