diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /include/linux/sched.h | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 158d53d07765..38a3f4b15394 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -284,7 +284,6 @@ long io_schedule_timeout(long timeout); | |||
| 284 | 284 | ||
| 285 | extern void cpu_init (void); | 285 | extern void cpu_init (void); |
| 286 | extern void trap_init(void); | 286 | extern void trap_init(void); |
| 287 | extern void account_process_tick(struct task_struct *task, int user); | ||
| 288 | extern void update_process_times(int user); | 287 | extern void update_process_times(int user); |
| 289 | extern void scheduler_tick(void); | 288 | extern void scheduler_tick(void); |
| 290 | 289 | ||