SOURCES (LINUX_2_6): patch-2.6.14-rc4-rt6 - trivial build fixes.

pluto pluto at pld-linux.org
Mon Oct 17 13:56:00 CEST 2005


Author: pluto                        Date: Mon Oct 17 11:56:00 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- trivial build fixes.

---- Files affected:
SOURCES:
   patch-2.6.14-rc4-rt6 (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/patch-2.6.14-rc4-rt6
diff -u SOURCES/patch-2.6.14-rc4-rt6:1.1.2.1 SOURCES/patch-2.6.14-rc4-rt6:1.1.2.2
--- SOURCES/patch-2.6.14-rc4-rt6:1.1.2.1	Mon Oct 17 13:24:57 2005
+++ SOURCES/patch-2.6.14-rc4-rt6	Mon Oct 17 13:55:55 2005
@@ -828,15 +828,6 @@
 ===================================================================
 --- linux.orig/Makefile
 +++ linux/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 14
--EXTRAVERSION =-rc4
-+EXTRAVERSION =-rc4-rt6
- NAME=Affluent Albatross
- 
- # *DOCUMENTATION*
 @@ -517,10 +517,14 @@ CFLAGS		+= $(call add-align,CONFIG_CC_AL
  CFLAGS		+= $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
  CFLAGS		+= $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)
@@ -3245,9 +3236,9 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
 +#include <linux/irq.h>
+ #include <linux/device.h>
  
- #include <asm/hardware.h>
- #include <asm/page.h>
+ #include <asm/types.h>
 Index: linux/arch/arm/mach-lh7a40x/arch-kev7a400.c
 ===================================================================
 --- linux.orig/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -53578,4 +53569,34 @@
 +static DEFINE_SPINLOCK(midi_spinlock);
  
  static void init_midi_hdr(struct midi_hdr *midihdr)
+ {
+--- linux.orig/kernel/time.c	2005-10-15 11:29:19.000000000 -0400
++++ linux/kernel/time.c	2005-10-16 04:03:57.000000000 -0400
+@@ -631,6 +631,7 @@
+ 
+ 	return ((u64)ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec;
+ }
++EXPORT_SYMBOL_GPL(do_monotonic_clock);
+
+ #endif /* !CONFIG_GENERIC_TIME */
+ 
+--- linux.orig/kernel/time/timeofday.c	2005-10-15 11:29:19.000000000 -0400
++++ linux/kernel/time/timeofday.c	2005-10-16 04:04:07.000000000 -0400
+@@ -213,6 +213,7 @@
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL_GPL(do_monotonic_clock);
+
+ /**
+  * getnsmonotonic - Returns the monotonic time in a timespec
+--- .orig/arch/i386/kernel/i8253.c	2005-10-16 04:12:44.000000000 -0400
++++ /arch/i386/kernel/i8253.c	2005-10-16 04:16:07.000000000 -0400
+@@ -14,6 +14,7 @@
+ #include "io_ports.h"
+ 
+ DEFINE_RAW_SPINLOCK(i8253_lock);
++EXPORT_SYMBOL(i8253_lock);
+
+ static void init_pit_timer(int mode)
  {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/patch-2.6.14-rc4-rt6?r1=1.1.2.1&r2=1.1.2.2&f=u




More information about the pld-cvs-commit mailing list