diff options
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/time.c | 8 | ||||
-rw-r--r-- | arch/blackfin/kernel/traps.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index 5bd64e341df3..9bdc8f99183a 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c | |||
@@ -137,9 +137,6 @@ irqreturn_t timer_interrupt(int irq, void *dummy) | |||
137 | 137 | ||
138 | do_timer(1); | 138 | do_timer(1); |
139 | 139 | ||
140 | #ifndef CONFIG_SMP | ||
141 | update_process_times(user_mode(get_irq_regs())); | ||
142 | #endif | ||
143 | profile_tick(CPU_PROFILING); | 140 | profile_tick(CPU_PROFILING); |
144 | 141 | ||
145 | /* | 142 | /* |
@@ -161,6 +158,11 @@ irqreturn_t timer_interrupt(int irq, void *dummy) | |||
161 | last_rtc_update = xtime.tv_sec - 600; | 158 | last_rtc_update = xtime.tv_sec - 600; |
162 | } | 159 | } |
163 | write_sequnlock(&xtime_lock); | 160 | write_sequnlock(&xtime_lock); |
161 | |||
162 | #ifndef CONFIG_SMP | ||
163 | update_process_times(user_mode(get_irq_regs())); | ||
164 | #endif | ||
165 | |||
164 | return IRQ_HANDLED; | 166 | return IRQ_HANDLED; |
165 | } | 167 | } |
166 | 168 | ||
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 58717cb19707..56a67ab698c7 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -126,15 +126,13 @@ static void decode_address(char *buf, unsigned long address) | |||
126 | struct vm_area_struct *vma = vml->vma; | 126 | struct vm_area_struct *vma = vml->vma; |
127 | 127 | ||
128 | if (address >= vma->vm_start && address < vma->vm_end) { | 128 | if (address >= vma->vm_start && address < vma->vm_end) { |
129 | char _tmpbuf[256]; | ||
129 | char *name = p->comm; | 130 | char *name = p->comm; |
130 | struct file *file = vma->vm_file; | 131 | struct file *file = vma->vm_file; |
131 | if (file) { | 132 | |
132 | char _tmpbuf[256]; | 133 | if (file) |
133 | name = d_path(file->f_dentry, | 134 | name = d_path(&file->f_path, _tmpbuf, |
134 | file->f_vfsmnt, | 135 | sizeof(_tmpbuf)); |
135 | _tmpbuf, | ||
136 | sizeof(_tmpbuf)); | ||
137 | } | ||
138 | 136 | ||
139 | /* FLAT does not have its text aligned to the start of | 137 | /* FLAT does not have its text aligned to the start of |
140 | * the map while FDPIC ELF does ... | 138 | * the map while FDPIC ELF does ... |