SOURCES (LINUX_2_6): linux-2.6-x8664-kernel-clock-is-running-2-tim...

pluto pluto at pld-linux.org
Wed Nov 23 16:11:01 CET 2005


Author: pluto                        Date: Wed Nov 23 15:10:49 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- build fix:
arch/x86_64/kernel/io_apic.c:48: error: conflicting declarations of `disable_timer_pin_1'
arch/x86_64/kernel/io_apic.c:46: error: `disable_timer_pin_1' previously declared here
arch/x86_64/kernel/io_apic.c:46: warning: `disable_timer_pin_1' defined but not used

---- Files affected:
SOURCES:
   linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch
diff -u SOURCES/linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch:1.1.2.1 SOURCES/linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch:1.1.2.2
--- SOURCES/linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch:1.1.2.1	Mon Nov 21 10:35:00 2005
+++ SOURCES/linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch	Wed Nov 23 16:10:42 2005
@@ -1,13 +1,5 @@
 --- linux-2.6.14.2/arch/x86_64/kernel/io_apic.c.orig	2005-11-11 06:33:12.000000000 +0100
 +++ linux-2.6.14.2/arch/x86_64/kernel/io_apic.c	2005-11-21 10:16:28.362717500 +0100
-@@ -43,6 +43,7 @@
- int sis_apic_bug; /* not actually supported, dummy for compile */
- 
- static int no_timer_check;
-+static int disable_timer_pin_1;
- 
- int disable_timer_pin_1 __initdata;
- 
 @@ -265,18 +266,24 @@ void __init check_ioapic(void) 
  			for (func = 0; func < 8; func++) { 
  				u32 class;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-x8664-kernel-clock-is-running-2-times-too-fast.patch?r1=1.1.2.1&r2=1.1.2.2&f=u




More information about the pld-cvs-commit mailing list