Re: 2.6.0-test1 doesn't compile on PPC iBook2.2

From: Mikael Pettersson (mikpe@csd.uu.se)
Date: Wed Jul 16 2003 - 19:15:27 EST


On Wed, 16 Jul 2003 22:14:40 +0100, Miguel Sousa Filipe wrote:
> CC arch/ppc/kernel/time.o
>arch/ppc/kernel/time.c: In function `do_settimeofday':
>arch/ppc/kernel/time.c:247: conflicting types for `new_nsec'
>arch/ppc/kernel/time.c:245: previous declaration of `new_nsec'
>arch/ppc/kernel/time.c:247: conflicting types for `new_sec'
>arch/ppc/kernel/time.c:244: previous declaration of `new_sec'
>make[1]: *** [arch/ppc/kernel/time.o] Error 1
>make: *** [arch/ppc/kernel] Error 2

Apply the following patch:

--- linux-2.6.0-test1/arch/ppc/kernel/time.c.~1~ 2003-07-14 13:17:24.000000000 +0200
+++ linux-2.6.0-test1/arch/ppc/kernel/time.c 2003-07-14 19:06:58.000000000 +0200
@@ -244,7 +244,7 @@
         time_t wtm_sec, new_sec = tv->tv_sec;
         long wtm_nsec, new_nsec = tv->tv_nsec;
         unsigned long flags;
- int tb_delta, new_nsec, new_sec;
+ int tb_delta;
 
         if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
                 return -EINVAL;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:27 EST