Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 711f77f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Define ARCH_SLAB_MINALIGN
  drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
  sparc64: Fix stack dumping and tracing when function graph is enabled.
  sparc64: Show stack backtrace from show_regs() just like other platforms.
parents 024a6b95 273fca0e

arch/sparc/include/asm/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#ifndef _SPARC_CACHE_H

#define _SPARC_CACHE_H



#define ARCH_SLAB_MINALIGN	__alignof__(unsigned long long)



#define L1_CACHE_SHIFT 5

#define L1_CACHE_BYTES 32

#define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)))

arch/sparc/kernel/perf_event.c

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/perf_event.h>

#include <linux/kprobes.h>

#include <linux/ftrace.h>

#include <linux/kernel.h>

#include <linux/kdebug.h>

#include <linux/mutex.h>
@@ -1276,6 +1277,9 @@ static void perf_callchain_kernel(struct pt_regs *regs, 
				  struct perf_callchain_entry *entry)

{

	unsigned long ksp, fp;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	int graph = 0;

#endif



	callchain_store(entry, PERF_CONTEXT_KERNEL);

	callchain_store(entry, regs->tpc);
@@ -1303,6 +1307,16 @@ static void perf_callchain_kernel(struct pt_regs *regs, 
			fp = (unsigned long)sf->fp + STACK_BIAS;

		}

		callchain_store(entry, pc);

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

		if ((pc + 8UL) == (unsigned long) &return_to_handler) {

			int index = current->curr_ret_stack;

			if (current->ret_stack && index >= graph) {

				pc = current->ret_stack[index - graph].ret;

				callchain_store(entry, pc);

				graph++;

			}

		}

#endif

	} while (entry->nr < PERF_MAX_STACK_DEPTH);

}

arch/sparc/kernel/process_64.c

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ void show_regs(struct pt_regs *regs) 
	       regs->u_regs[15]);

	printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);

	show_regwindow(regs);

	show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);

}



struct global_reg_snapshot global_reg_snapshot[NR_CPUS];

arch/sparc/kernel/stacktrace.c

+22 −1
Original line number Diff line number Diff line 
#include <linux/sched.h>

#include <linux/stacktrace.h>

#include <linux/thread_info.h>

#include <linux/ftrace.h>

#include <linux/module.h>

#include <asm/ptrace.h>

#include <asm/stacktrace.h>
@@ -12,6 +13,10 @@ static void __save_stack_trace(struct thread_info *tp, 
			       bool skip_sched)

{

	unsigned long ksp, fp;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	struct task_struct *t;

	int graph = 0;

#endif



	if (tp == current_thread_info()) {

		stack_trace_flush();
@@ -21,6 +26,9 @@ static void __save_stack_trace(struct thread_info *tp, 
	}



	fp = ksp + STACK_BIAS;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	t = tp->task;

#endif

	do {

		struct sparc_stackf *sf;

		struct pt_regs *regs;
@@ -44,8 +52,21 @@ static void __save_stack_trace(struct thread_info *tp, 


		if (trace->skip > 0)

			trace->skip--;

		else if (!skip_sched || !in_sched_functions(pc))

		else if (!skip_sched || !in_sched_functions(pc)) {

			trace->entries[trace->nr_entries++] = pc;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

			if ((pc + 8UL) == (unsigned long) &return_to_handler) {

				int index = t->curr_ret_stack;

				if (t->ret_stack && index >= graph) {

					pc = t->ret_stack[index - graph].ret;

					if (trace->nr_entries <

					    trace->max_entries)

						trace->entries[trace->nr_entries++] = pc;

					graph++;

				}

			}

#endif

		}

	} while (trace->nr_entries < trace->max_entries);

}

arch/sparc/kernel/traps_64.c

+14 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/mm.h>

#include <linux/init.h>

#include <linux/kdebug.h>

#include <linux/ftrace.h>

#include <linux/gfp.h>



#include <asm/smp.h>
@@ -2154,6 +2155,9 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) 
	unsigned long fp, thread_base, ksp;

	struct thread_info *tp;

	int count = 0;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	int graph = 0;

#endif



	ksp = (unsigned long) _ksp;

	if (!tsk)
@@ -2193,6 +2197,16 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) 
		}



		printk(" [%016lx] %pS\n", pc, (void *) pc);

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

		if ((pc + 8UL) == (unsigned long) &return_to_handler) {

			int index = tsk->curr_ret_stack;

			if (tsk->ret_stack && index >= graph) {

				pc = tsk->ret_stack[index - graph].ret;

				printk(" [%016lx] %pS\n", pc, (void *) pc);

				graph++;

			}

		}

#endif

	} while (++count < 16);

}