Commit 9bccbe7b authored by Zheng Zengkai's avatar Zheng Zengkai Committed by Daniel Thompson
Browse files

kdb: Get rid of redundant kdb_curr_task() 



Commit cf8e8658 ("arch: Remove Itanium (IA-64) architecture")
removed the only definition of macro _TIF_MCA_INIT, so kdb_curr_task()
is actually the same as curr_task() now and becomes redundant.

Let's remove the definition of kdb_curr_task() and replace remaining
calls with curr_task().

Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20240620142132.157518-1-zhengzengkai@huawei.com


Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
parent e2e82109

kernel/debug/kdb/kdb_bt.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ kdb_bt(int argc, const char **argv) 
			kdb_ps_suppressed();

		/* Run the active tasks first */

		for_each_online_cpu(cpu) {

			p = kdb_curr_task(cpu);

			p = curr_task(cpu);

			if (kdb_bt1(p, mask, btaprompt))

				return 0;

		}

kernel/debug/kdb/kdb_main.c

+4 −14
Original line number Diff line number Diff line
@@ -155,16 +155,6 @@ static char *__env[31] = { 


static const int __nenv = ARRAY_SIZE(__env);



struct task_struct *kdb_curr_task(int cpu)

{

	struct task_struct *p = curr_task(cpu);

#ifdef	_TIF_MCA_INIT

	if ((task_thread_info(p)->flags & _TIF_MCA_INIT) && KDB_TSK(cpu))

		p = krp->p;

#endif

	return p;

}



/*

 * Update the permissions flags (kdb_cmd_enabled) to match the

 * current lockdown state.
@@ -1228,7 +1218,7 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs, 
	char *cmdbuf;

	int diag;

	struct task_struct *kdb_current =

		kdb_curr_task(raw_smp_processor_id());

		curr_task(raw_smp_processor_id());



	KDB_DEBUG_STATE("kdb_local 1", reason);
@@ -2278,7 +2268,7 @@ void kdb_ps_suppressed(void) 
	unsigned long cpu;

	const struct task_struct *p, *g;

	for_each_online_cpu(cpu) {

		p = kdb_curr_task(cpu);

		p = curr_task(cpu);

		if (kdb_task_state(p, "-"))

			++idle;

	}
@@ -2314,7 +2304,7 @@ void kdb_ps1(const struct task_struct *p) 
		   kdb_task_has_cpu(p), kdb_process_cpu(p),

		   kdb_task_state_char(p),

		   (void *)(&p->thread),

		   p == kdb_curr_task(raw_smp_processor_id()) ? '*' : ' ',

		   p == curr_task(raw_smp_processor_id()) ? '*' : ' ',

		   p->comm);

	if (kdb_task_has_cpu(p)) {

		if (!KDB_TSK(cpu)) {
@@ -2350,7 +2340,7 @@ static int kdb_ps(int argc, const char **argv) 
	for_each_online_cpu(cpu) {

		if (KDB_FLAG(CMD_INTERRUPT))

			return 0;

		p = kdb_curr_task(cpu);

		p = curr_task(cpu);

		if (kdb_task_state(p, mask))

			kdb_ps1(p);

	}

kernel/debug/kdb/kdb_private.h

+0 −2
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ extern void kdb_gdb_state_pass(char *buf); 
#define KDB_TSK(cpu) kgdb_info[cpu].task

#define KDB_TSKREGS(cpu) kgdb_info[cpu].debuggerinfo



extern struct task_struct *kdb_curr_task(int);



#define kdb_task_has_cpu(p) (task_curr(p))



#define GFP_KDB (in_dbg_master() ? GFP_ATOMIC : GFP_KERNEL)