Skip to contentSkip to conversation

cris: remove kernel 2.0 #ifdef's (fwd)

PATCH New Adrian Bunk 1 participant 1 message Dec 11, 2004

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 cris: remove kernel 2.0 #ifdef's (fwd)

The trivial patch forwarded below still applies against 2.6.10-rc2-mm4.

Please apply.

----- Forwarded message from Adrian Bunk <[email protected]> -----

Date: Sat, 7 Feb 2004 21:35:25 +0100
From: Adrian Bunk <[email protected]>
To: [email protected]
Cc: [email protected], [email protected]
Subject: [2.6 patch] cris: remove kernel 2.0 #ifdef's

The patch below removes some kernel 2.0 #ifdef's from arch/cris/arch-v10/kernel/fasttimer.c .

Please apply
Adrian

Signed-off-by Adrian Bunk <[email protected]>
arch/cris/arch-v10/kernel/fasttimer.c renamed from arch/cris/arch-v10/kernel/fasttimer.c.old +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))

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

----- End forwarded message -----