Commit 51daa42d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "i915: Move list_count() to list.h for broader use" 

This reverts commit a9efc04c as it
breaks the build.

Link: https://lore.kernel.org/r/20221130131854.35b58b16@canb.auug.org.au
Link: https://lore.kernel.org/r/202211301628.iwMjPVMp-lkp@intel.com


Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54aa8af5

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+12 −1
Original line number Diff line number Diff line
@@ -2004,6 +2004,17 @@ static void print_request_ring(struct drm_printer *m, struct i915_request *rq) 
	}

}



static unsigned long list_count(struct list_head *list)

{

	struct list_head *pos;

	unsigned long count = 0;



	list_for_each(pos, list)

		count++;



	return count;

}



static unsigned long read_ul(void *p, size_t x)

{

	return *(unsigned long *)(p + x);
@@ -2178,7 +2189,7 @@ void intel_engine_dump(struct intel_engine_cs *engine, 
	spin_lock_irqsave(&engine->sched_engine->lock, flags);

	engine_dump_active_requests(engine, m);



	drm_printf(m, "\tOn hold?: %zu\n",

	drm_printf(m, "\tOn hold?: %lu\n",

		   list_count(&engine->sched_engine->hold));

	spin_unlock_irqrestore(&engine->sched_engine->lock, flags);

include/linux/list.h

+0 −15
Original line number Diff line number Diff line
@@ -655,21 +655,6 @@ static inline void list_splice_tail_init(struct list_head *list, 
	     !list_is_head(pos, (head)); \

	     pos = n, n = pos->prev)



/**

 * list_count - count nodes in the list

 * @head:	the head for your list.

 */

static inline size_t list_count(struct list_head *head)

{

	struct list_head *pos;

	size_t count = 0;



	list_for_each(pos, head)

		count++;



	return count;

}



/**

 * list_entry_is_head - test if the entry points to the head of the list

 * @pos:	the type * to cursor