Merge branch 'core/debugobjects' into core/urgent

{

	gfp_t gfp = GFP_ATOMIC | __GFP_NORETRY | __GFP_NOWARN;

	struct debug_obj *new;

	unsigned long flags;

	if (likely(obj_pool_free >= ODEBUG_POOL_MIN_LEVEL))

		return obj_pool_free;

		if (!new)

			return obj_pool_free;

		spin_lock(&pool_lock);

		spin_lock_irqsave(&pool_lock, flags);

		hlist_add_head(&new->node, &obj_pool);

		obj_pool_free++;

		spin_unlock(&pool_lock);

		spin_unlock_irqrestore(&pool_lock, flags);

	}

	return obj_pool_free;

}

}

/*

 * Allocate a new object. If the pool is empty and no refill possible,

 * switch off the debugger.

 * Allocate a new object. If the pool is empty, switch off the debugger.

 */

static struct debug_obj *

alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr)

{

	struct debug_obj *obj = NULL;

	int retry = 0;

repeat:

	spin_lock(&pool_lock);

	if (obj_pool.first) {

		obj	    = hlist_entry(obj_pool.first, typeof(*obj), node);

	}

	spin_unlock(&pool_lock);

	if (fill_pool() && !obj && !retry++)

		goto repeat;

	return obj;

}

	struct debug_obj *obj;

	unsigned long flags;

	fill_pool();

	db = get_bucket((unsigned long) addr);

	spin_lock_irqsave(&db->lock, flags);