diff options
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/time.c | 2 | ||||
-rw-r--r-- | arch/alpha/mm/fault.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index b191cc759737..7c1e44420a78 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c | |||
@@ -132,7 +132,7 @@ irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs) | |||
132 | nticks = delta >> FIX_SHIFT; | 132 | nticks = delta >> FIX_SHIFT; |
133 | 133 | ||
134 | while (nticks > 0) { | 134 | while (nticks > 0) { |
135 | do_timer(regs); | 135 | do_timer(1); |
136 | #ifndef CONFIG_SMP | 136 | #ifndef CONFIG_SMP |
137 | update_process_times(user_mode(regs)); | 137 | update_process_times(user_mode(regs)); |
138 | #endif | 138 | #endif |
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 622dabd84680..8871529a34e2 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c | |||
@@ -193,7 +193,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, | |||
193 | /* We ran out of memory, or some other thing happened to us that | 193 | /* We ran out of memory, or some other thing happened to us that |
194 | made us unable to handle the page fault gracefully. */ | 194 | made us unable to handle the page fault gracefully. */ |
195 | out_of_memory: | 195 | out_of_memory: |
196 | if (current->pid == 1) { | 196 | if (is_init(current)) { |
197 | yield(); | 197 | yield(); |
198 | down_read(&mm->mmap_sem); | 198 | down_read(&mm->mmap_sem); |
199 | goto survive; | 199 | goto survive; |