diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/microblaze/kernel/unwind.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/microblaze/kernel/unwind.c')
| -rw-r--r-- | arch/microblaze/kernel/unwind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/unwind.c b/arch/microblaze/kernel/unwind.c index fefac5c33586..9781a528cfc9 100644 --- a/arch/microblaze/kernel/unwind.c +++ b/arch/microblaze/kernel/unwind.c | |||
| @@ -183,7 +183,7 @@ static inline void unwind_trap(struct task_struct *task, unsigned long pc, | |||
| 183 | * @trace : Where to store stack backtrace (PC values). | 183 | * @trace : Where to store stack backtrace (PC values). |
| 184 | * NULL == print backtrace to kernel log | 184 | * NULL == print backtrace to kernel log |
| 185 | */ | 185 | */ |
| 186 | void microblaze_unwind_inner(struct task_struct *task, | 186 | static void microblaze_unwind_inner(struct task_struct *task, |
| 187 | unsigned long pc, unsigned long fp, | 187 | unsigned long pc, unsigned long fp, |
| 188 | unsigned long leaf_return, | 188 | unsigned long leaf_return, |
| 189 | struct stack_trace *trace) | 189 | struct stack_trace *trace) |