ifdefs:
PATCH 1/16 ifdefs:
arch/cris/arch-v10/kernel/fasttimer.c +2 -28
@@ -592,23 +592,8 @@#ifdef CONFIG_PROC_FS static int proc_fasttimer_read (char *buf,char **start,off_t offset,int len -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) - ,int *eof,void *data_unused -#else - ,int unused -#endif - ); -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,2 ,0 ) + ,int *eof,void *data_unused);static struct proc_dir_entry *fasttimer_proc_entry; -#else -static struct proc_dir_entry fasttimer_proc_entry = -{ -0 ,9 ,"fasttimer" , -S_IFREG |S_IRUGO ,1 ,0 ,0 , -0 ,NULL /* ops -- default to array */ , - &proc_fasttimer_read/* get_info */ , -}; -#endif #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_PROC_FS
@@ -617,12 +602,7 @@#define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300)static int proc_fasttimer_read (char *buf,char **start,off_t offset,int len -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) - ,int *eof,void *data_unused -#else - ,int unused -#endif - ) + ,int *eof,void *data_unused) {unsigned long flags;int i =0 ;
@@ -798,9 +778,7 @@memcpy (buf, bigbuf + offset, len); *start = buf; -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,2 ,0 ) *eof =1 ; -#endif return len; }
@@ -975,12 +953,8 @@ }#endif #ifdef CONFIG_PROC_FS -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,2 ,0 )if ((fasttimer_proc_entry =create_proc_entry ("fasttimer" ,0 ,0 ))) fasttimer_proc_entry->read_proc = proc_fasttimer_read; -#else -proc_register_dynamic (&proc_root, &fasttimer_proc_entry); -#endif #endif /* PROC_FS */ if (request_irq (TIMER1_IRQ_NBR , timer1_handler,SA_SHIRQ ,"fast timer int" ,NULL ))
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors