Commit d332736d authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Rename max_stack_lock to stack_trace_max_lock 



Now that max_stack_lock is a global variable, it requires a naming
convention that is unlikely to collide. Rename it to the same naming
convention that the other stack_trace variables have.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent bb99d8cc

include/linux/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ struct stack_trace; 
extern unsigned stack_trace_index[];

extern struct stack_trace stack_trace_max;

extern unsigned long stack_trace_max_size;

extern arch_spinlock_t max_stack_lock;

extern arch_spinlock_t stack_trace_max_lock;



extern int stack_tracer_enabled;

void stack_trace_print(void);

kernel/trace/trace_stack.c

+8 −8
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct stack_trace stack_trace_max = { 
};



unsigned long stack_trace_max_size;

arch_spinlock_t max_stack_lock =

arch_spinlock_t stack_trace_max_lock =

	(arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;



static DEFINE_PER_CPU(int, trace_active);
@@ -65,7 +65,7 @@ void stack_trace_print(void) 


/*

 * When arch-specific code overides this function, the following

 * data should be filled up, assuming max_stack_lock is held to

 * data should be filled up, assuming stack_trace_max_lock is held to

 * prevent concurrent updates.

 *     stack_trace_index[]

 *     stack_trace_max
@@ -92,7 +92,7 @@ check_stack(unsigned long ip, unsigned long *stack) 
		return;



	local_irq_save(flags);

	arch_spin_lock(&max_stack_lock);

	arch_spin_lock(&stack_trace_max_lock);



	/* In case another CPU set the tracer_frame on us */

	if (unlikely(!frame_size))
@@ -175,7 +175,7 @@ check_stack(unsigned long ip, unsigned long *stack) 
	}



 out:

	arch_spin_unlock(&max_stack_lock);

	arch_spin_unlock(&stack_trace_max_lock);

	local_irq_restore(flags);

}
@@ -246,9 +246,9 @@ stack_max_size_write(struct file *filp, const char __user *ubuf, 
	cpu = smp_processor_id();

	per_cpu(trace_active, cpu)++;



	arch_spin_lock(&max_stack_lock);

	arch_spin_lock(&stack_trace_max_lock);

	*ptr = val;

	arch_spin_unlock(&max_stack_lock);

	arch_spin_unlock(&stack_trace_max_lock);



	per_cpu(trace_active, cpu)--;

	local_irq_restore(flags);
@@ -291,7 +291,7 @@ static void *t_start(struct seq_file *m, loff_t *pos) 
	cpu = smp_processor_id();

	per_cpu(trace_active, cpu)++;



	arch_spin_lock(&max_stack_lock);

	arch_spin_lock(&stack_trace_max_lock);



	if (*pos == 0)

		return SEQ_START_TOKEN;
@@ -303,7 +303,7 @@ static void t_stop(struct seq_file *m, void *p) 
{

	int cpu;



	arch_spin_unlock(&max_stack_lock);

	arch_spin_unlock(&stack_trace_max_lock);



	cpu = smp_processor_id();

	per_cpu(trace_active, cpu)--;

CRA Git | Maintained and supported by SUSTech CRA and CCSE