diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/kernel/fasttimer.c | 4 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/fasttimer.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c index 082f1890bacb..52bb9b5531e1 100644 --- a/arch/cris/arch-v10/kernel/fasttimer.c +++ b/arch/cris/arch-v10/kernel/fasttimer.c | |||
@@ -491,7 +491,6 @@ void schedule_usleep(unsigned long us) | |||
491 | #ifdef CONFIG_PROC_FS | 491 | #ifdef CONFIG_PROC_FS |
492 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len | 492 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len |
493 | ,int *eof, void *data_unused); | 493 | ,int *eof, void *data_unused); |
494 | static struct proc_dir_entry *fasttimer_proc_entry; | ||
495 | #endif /* CONFIG_PROC_FS */ | 494 | #endif /* CONFIG_PROC_FS */ |
496 | 495 | ||
497 | #ifdef CONFIG_PROC_FS | 496 | #ifdef CONFIG_PROC_FS |
@@ -857,8 +856,7 @@ int fast_timer_init(void) | |||
857 | } | 856 | } |
858 | #endif | 857 | #endif |
859 | #ifdef CONFIG_PROC_FS | 858 | #ifdef CONFIG_PROC_FS |
860 | if ((fasttimer_proc_entry = create_proc_entry( "fasttimer", 0, 0 ))) | 859 | create_proc_read_entry("fasttimer", 0, NULL, proc_fasttimer_read, NULL); |
861 | fasttimer_proc_entry->read_proc = proc_fasttimer_read; | ||
862 | #endif /* PROC_FS */ | 860 | #endif /* PROC_FS */ |
863 | if(request_irq(TIMER1_IRQ_NBR, timer1_handler, 0, | 861 | if(request_irq(TIMER1_IRQ_NBR, timer1_handler, 0, |
864 | "fast timer int", NULL)) | 862 | "fast timer int", NULL)) |
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index ab1551ee43c5..dd1c998070e9 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c | |||
@@ -465,7 +465,6 @@ void schedule_usleep(unsigned long us) | |||
465 | #ifdef CONFIG_PROC_FS | 465 | #ifdef CONFIG_PROC_FS |
466 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len | 466 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len |
467 | ,int *eof, void *data_unused); | 467 | ,int *eof, void *data_unused); |
468 | static struct proc_dir_entry *fasttimer_proc_entry; | ||
469 | #endif /* CONFIG_PROC_FS */ | 468 | #endif /* CONFIG_PROC_FS */ |
470 | 469 | ||
471 | #ifdef CONFIG_PROC_FS | 470 | #ifdef CONFIG_PROC_FS |
@@ -816,9 +815,7 @@ int fast_timer_init(void) | |||
816 | printk("fast_timer_init()\n"); | 815 | printk("fast_timer_init()\n"); |
817 | 816 | ||
818 | #ifdef CONFIG_PROC_FS | 817 | #ifdef CONFIG_PROC_FS |
819 | fasttimer_proc_entry = create_proc_entry("fasttimer", 0, 0); | 818 | create_proc_read_entry("fasttimer", 0, NULL, proc_fasttimer_read, NULL); |
820 | if (fasttimer_proc_entry) | ||
821 | fasttimer_proc_entry->read_proc = proc_fasttimer_read; | ||
822 | #endif /* PROC_FS */ | 819 | #endif /* PROC_FS */ |
823 | if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt, | 820 | if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt, |
824 | IRQF_SHARED | IRQF_DISABLED, | 821 | IRQF_SHARED | IRQF_DISABLED, |