rpms/kernel/devel kernel.spec, 1.212, 1.213 linux-2.6-highres-timers.patch, 1.15, 1.16 linux-2.6-acpi-cpuidle-port-suspend-fixes.patch, 1.1, NONE linux-2.6-x86-AMD-c1e-disable-apic-timer.patch, 1.1, NONE

Dave Jones (davej) fedora-extras-commits at redhat.com
Wed Oct 10 19:51:11 UTC 2007


Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24538

Modified Files:
	kernel.spec linux-2.6-highres-timers.patch 
Removed Files:
	linux-2.6-acpi-cpuidle-port-suspend-fixes.patch 
	linux-2.6-x86-AMD-c1e-disable-apic-timer.patch 
Log Message:
* Wed Oct 10 2007 Dave Jones <davej at redhat.com>
- Update highres timers patch to latest upstream (2.6.23-hrt1)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- kernel.spec	10 Oct 2007 19:39:13 -0000	1.212
+++ kernel.spec	10 Oct 2007 19:50:38 -0000	1.213
@@ -547,9 +547,7 @@
 
 %if !%{nopatches}
 
-Patch18: linux-2.6-x86-AMD-c1e-disable-apic-timer.patch
 Patch19: linux-2.6-highres-timers.patch
-Patch20: linux-2.6-acpi-cpuidle-port-suspend-fixes.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
@@ -959,12 +957,8 @@
 
 %if !%{nopatches}
 
-# fix timer with AMD chips supporting C1e
-ApplyPatch linux-2.6-x86-AMD-c1e-disable-apic-timer.patch
-# patch-2.6.23-rc3-hrt2.patch
+# patch-2.6.23-hrt1.patch
 ApplyPatch linux-2.6-highres-timers.patch
-# port suspend/resume C-state fixes to cpuidle
-ApplyPatch linux-2.6-acpi-cpuidle-port-suspend-fixes.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
@@ -1814,6 +1808,9 @@
 
 
 %changelog
+* Wed Oct 10 2007 Dave Jones <davej at redhat.com>
+- Update highres timers patch to latest upstream (2.6.23-hrt1)
+
 * Wed Oct 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - Fix date/time printed during boot.
 - Port ACPI suspend/resume fixes to cpuidle.

linux-2.6-highres-timers.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.15 -r 1.16 linux-2.6-highres-timers.patch
Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-highres-timers.patch	27 Sep 2007 16:33:17 -0000	1.15
+++ linux-2.6-highres-timers.patch	10 Oct 2007 19:50:38 -0000	1.16
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc7/include/linux/clockchips.h
+Index: linux-2.6.23/include/linux/clockchips.h
 ===================================================================
---- linux-2.6.23-rc7.orig/include/linux/clockchips.h	2007-09-20 21:06:24.000000000 +0200
-+++ linux-2.6.23-rc7/include/linux/clockchips.h	2007-09-20 21:06:24.000000000 +0200
+--- linux-2.6.23.orig/include/linux/clockchips.h	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/include/linux/clockchips.h	2007-10-10 09:43:06.000000000 +0200
 @@ -8,7 +8,7 @@
  #ifndef _LINUX_CLOCKCHIPS_H
  #define _LINUX_CLOCKCHIPS_H
@@ -28,10 +28,10 @@
  #define clockevents_notify(reason, arg) do { } while (0)
  
  #endif
-Index: linux-2.6.23-rc7/kernel/time/Kconfig
+Index: linux-2.6.23/kernel/time/Kconfig
 ===================================================================
---- linux-2.6.23-rc7.orig/kernel/time/Kconfig	2007-09-20 21:06:23.000000000 +0200
-+++ linux-2.6.23-rc7/kernel/time/Kconfig	2007-09-20 21:06:24.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/Kconfig	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/kernel/time/Kconfig	2007-10-10 09:43:06.000000000 +0200
 @@ -23,3 +23,8 @@ config HIGH_RES_TIMERS
  	  hardware is not capable then this option only increases
  	  the size of the kernel image.
@@ -41,10 +41,10 @@
 +	default y
 +	depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR
 +
-Index: linux-2.6.23-rc7/kernel/time/Makefile
+Index: linux-2.6.23/kernel/time/Makefile
 ===================================================================
---- linux-2.6.23-rc7.orig/kernel/time/Makefile	2007-09-20 21:06:23.000000000 +0200
-+++ linux-2.6.23-rc7/kernel/time/Makefile	2007-09-20 21:06:24.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/Makefile	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/kernel/time/Makefile	2007-10-10 09:43:06.000000000 +0200
 @@ -1,6 +1,6 @@
  obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
  
@@ -53,10 +53,10 @@
  obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= tick-common.o
  obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= tick-broadcast.o
  obj-$(CONFIG_TICK_ONESHOT)			+= tick-oneshot.o
-Index: linux-2.6.23-rc7/kernel/time/clockevents.c
+Index: linux-2.6.23/kernel/time/clockevents.c
 ===================================================================
---- linux-2.6.23-rc7.orig/kernel/time/clockevents.c	2007-09-20 21:06:23.000000000 +0200
-+++ linux-2.6.23-rc7/kernel/time/clockevents.c	2007-09-20 21:06:24.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/clockevents.c	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/kernel/time/clockevents.c	2007-10-10 09:43:06.000000000 +0200
 @@ -194,6 +194,7 @@ void clockevents_exchange_device(struct 
  	local_irq_restore(flags);
  }
@@ -71,10 +71,50 @@
  EXPORT_SYMBOL_GPL(clockevents_notify);
 -
 +#endif
-Index: linux-2.6.23-rc7/Documentation/00-INDEX
+Index: linux-2.6.23/kernel/time/tick-broadcast.c
 ===================================================================
---- linux-2.6.23-rc7.orig/Documentation/00-INDEX	2007-09-20 21:06:23.000000000 +0200
-+++ linux-2.6.23-rc7/Documentation/00-INDEX	2007-09-20 21:06:24.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/tick-broadcast.c	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/kernel/time/tick-broadcast.c	2007-10-10 09:43:09.000000000 +0200
+@@ -64,8 +64,9 @@ static void tick_broadcast_start_periodi
+  */
+ int tick_check_broadcast_device(struct clock_event_device *dev)
+ {
+-	if (tick_broadcast_device.evtdev ||
+-	    (dev->features & CLOCK_EVT_FEAT_C3STOP))
++	if ((tick_broadcast_device.evtdev &&
++	     tick_broadcast_device.evtdev->rating >= dev->rating) ||
++	     (dev->features & CLOCK_EVT_FEAT_C3STOP))
+ 		return 0;
+ 
+ 	clockevents_exchange_device(NULL, dev);
+@@ -176,8 +177,6 @@ static void tick_do_periodic_broadcast(v
+  */
+ static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
+ {
+-	dev->next_event.tv64 = KTIME_MAX;
+-
+ 	tick_do_periodic_broadcast();
+ 
+ 	/*
+@@ -515,11 +514,9 @@ static void tick_broadcast_clear_oneshot
+  */
+ void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+ {
+-	if (bc->mode != CLOCK_EVT_MODE_ONESHOT) {
+-		bc->event_handler = tick_handle_oneshot_broadcast;
+-		clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+-		bc->next_event.tv64 = KTIME_MAX;
+-	}
++	bc->event_handler = tick_handle_oneshot_broadcast;
++	clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
++	bc->next_event.tv64 = KTIME_MAX;
+ }
+ 
+ /*
+Index: linux-2.6.23/Documentation/00-INDEX
+===================================================================
+--- linux-2.6.23.orig/Documentation/00-INDEX	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/Documentation/00-INDEX	2007-10-10 09:43:06.000000000 +0200
 @@ -62,6 +62,8 @@ VGA-softcursor.txt
  	- how to change your VGA cursor from a blinking underscore.
  accounting/
@@ -84,10 +124,10 @@
  aoe/
  	- description of AoE (ATA over Ethernet) along with config examples.
  applying-patches.txt
-Index: linux-2.6.23-rc7/Documentation/acpi/00-INDEX
+Index: linux-2.6.23/Documentation/acpi/00-INDEX
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc7/Documentation/acpi/00-INDEX	2007-09-20 21:06:24.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/00-INDEX	2007-10-10 09:43:06.000000000 +0200
 @@ -0,0 +1,6 @@
 +00-INDEX
 +	- this file
@@ -95,10 +135,10 @@
 +	- where to start
 +acpi_debugging.txt
 +	- How to debug ACPI problems
-Index: linux-2.6.23-rc7/Documentation/acpi/README.ACPI
+Index: linux-2.6.23/Documentation/acpi/README.ACPI
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc7/Documentation/acpi/README.ACPI	2007-09-20 21:06:24.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/README.ACPI	2007-10-10 09:43:06.000000000 +0200
 @@ -0,0 +1,377 @@
 +Developing ACPI for Linux - July 13, 2007
 +------------------------------------------
@@ -477,10 +517,10 @@
 +However, neither case justifies this capability upstream.
 +
 +
-Index: linux-2.6.23-rc7/Documentation/acpi/acpi_debugging.txt
+Index: linux-2.6.23/Documentation/acpi/acpi_debugging.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc7/Documentation/acpi/acpi_debugging.txt	2007-09-20 21:06:24.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/acpi_debugging.txt	2007-10-10 09:43:06.000000000 +0200
 @@ -0,0 +1,173 @@
 +How to debug ACPI (Advanced Configuration and Power Interface) Problems
 +=======================================================================
@@ -655,10 +695,10 @@
 +						  that should get debugged with
 +						  very high debug output*/
 +	 acpi_debug_level=0x3        /* lower debug output again */
-Index: linux-2.6.23-rc7/arch/i386/Kconfig
+Index: linux-2.6.23/arch/i386/Kconfig
 ===================================================================
---- linux-2.6.23-rc7.orig/arch/i386/Kconfig	2007-09-20 21:06:23.000000000 +0200
-+++ linux-2.6.23-rc7/arch/i386/Kconfig	2007-09-20 21:06:24.000000000 +0200
+--- linux-2.6.23.orig/arch/i386/Kconfig	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/arch/i386/Kconfig	2007-10-10 09:43:06.000000000 +0200
 @@ -1069,6 +1069,8 @@ endif # APM
  
  source "arch/i386/kernel/cpu/cpufreq/Kconfig"
@@ -668,10 +708,10 @@
  endmenu
  
  menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
-Index: linux-2.6.23-rc7/arch/x86_64/Kconfig
+Index: linux-2.6.23/arch/x86_64/Kconfig
 ===================================================================
---- linux-2.6.23-rc7.orig/arch/x86_64/Kconfig	2007-09-20 21:06:23.000000000 +0200
-+++ linux-2.6.23-rc7/arch/x86_64/Kconfig	2007-09-20 21:06:25.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/Kconfig	2007-10-10 09:43:06.000000000 +0200
++++ linux-2.6.23/arch/x86_64/Kconfig	2007-10-10 09:43:08.000000000 +0200
 @@ -28,6 +28,18 @@ config GENERIC_TIME
  	bool
  	default y
@@ -691,7 +731,18 @@
  config GENERIC_TIME_VSYSCALL
  	bool
  	default y
-@@ -138,6 +150,8 @@ source "init/Kconfig"
+@@ -36,6 +48,10 @@ config GENERIC_CMOS_UPDATE
+ 	bool
+ 	default y
+ 
++config CLOCKSOURCE_WATCHDOG
++	bool
++	default y
++
+ config ZONE_DMA32
+ 	bool
+ 	default y
+@@ -130,6 +146,8 @@ source "init/Kconfig"
  
[...2487 lines suppressed...]
+@@ -19,7 +19,7 @@
  extern int apic_verbosity;
  extern int apic_runs_main_timer;
  extern int ioapic_force;
 -extern int apic_mapped;
- extern int disable_apic_timer;
++extern int disable_apic_timer;
  
  /*
-@@ -79,8 +78,6 @@ extern void smp_local_timer_interrupt (v
+  * Define the default level of output to be very little
+@@ -79,8 +79,6 @@ extern void smp_local_timer_interrupt (v
  extern void setup_boot_APIC_clock (void);
  extern void setup_secondary_APIC_clock (void);
  extern int APIC_init_uniprocessor (void);
@@ -5942,7 +5999,7 @@
  extern void setup_apic_routing(void);
  
  extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
-@@ -95,10 +92,6 @@ extern int apic_is_clustered_box(void);
+@@ -95,10 +93,6 @@ extern int apic_is_clustered_box(void);
  #define K8_APIC_EXT_INT_MSG_EXT 0x7
  #define K8_APIC_EXT_LVT_ENTRY_THRESHOLD    0
  
@@ -5953,10 +6010,10 @@
  #define ARCH_APICTIMER_STOPS_ON_C3	1
  
  extern unsigned boot_cpu_id;
-Index: linux-2.6.23-rc7/include/asm-x86_64/proto.h
+Index: linux-2.6.23/include/asm-x86_64/proto.h
 ===================================================================
---- linux-2.6.23-rc7.orig/include/asm-x86_64/proto.h	2007-09-20 21:06:22.000000000 +0200
-+++ linux-2.6.23-rc7/include/asm-x86_64/proto.h	2007-09-20 21:06:25.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/proto.h	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/proto.h	2007-10-10 09:43:08.000000000 +0200
 @@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
  
  extern void load_gs_index(unsigned gs);
@@ -5982,10 +6039,10 @@
  #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
  #define round_down(x,y) ((x) & ~((y)-1))
  
-Index: linux-2.6.23-rc7/include/linux/jiffies.h
+Index: linux-2.6.23/include/linux/jiffies.h
 ===================================================================
---- linux-2.6.23-rc7.orig/include/linux/jiffies.h	2007-09-20 21:06:22.000000000 +0200
-+++ linux-2.6.23-rc7/include/linux/jiffies.h	2007-09-20 21:06:26.000000000 +0200
+--- linux-2.6.23.orig/include/linux/jiffies.h	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/include/linux/jiffies.h	2007-10-10 09:43:08.000000000 +0200
 @@ -36,8 +36,6 @@
  /* LATCH is used in the interval timer and ftape setup. */
  #define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
@@ -6009,10 +6066,10 @@
  /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
  #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
  
-Index: linux-2.6.23-rc7/include/asm-i386/hpet.h
+Index: linux-2.6.23/include/asm-i386/hpet.h
 ===================================================================
---- linux-2.6.23-rc7.orig/include/asm-i386/hpet.h	2007-09-20 21:06:21.000000000 +0200
-+++ linux-2.6.23-rc7/include/asm-i386/hpet.h	2007-09-20 21:06:26.000000000 +0200
+--- linux-2.6.23.orig/include/asm-i386/hpet.h	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/include/asm-i386/hpet.h	2007-10-10 09:43:09.000000000 +0200
 @@ -64,8 +64,11 @@
  
  /* hpet memory map physical address */
@@ -6033,10 +6090,10 @@
  
  #endif /* CONFIG_HPET_TIMER */
  #endif /* _I386_HPET_H */
-Index: linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h
+Index: linux-2.6.23/include/asm-x86_64/vsyscall.h
 ===================================================================
---- linux-2.6.23-rc7.orig/include/asm-x86_64/vsyscall.h	2007-09-20 21:06:21.000000000 +0200
-+++ linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h	2007-09-20 21:06:26.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/vsyscall.h	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/vsyscall.h	2007-10-10 09:43:08.000000000 +0200
 @@ -29,9 +29,6 @@ enum vsyscall_num {
  #define VGETCPU_RDTSCP	1
  #define VGETCPU_LSL	2
@@ -6047,41 +6104,62 @@
  extern int __vgetcpu_mode;
  extern volatile unsigned long __jiffies;
  
-Index: linux-2.6.23-rc7/kernel/time/tick-broadcast.c
+Index: linux-2.6.23/arch/x86_64/kernel/setup.c
 ===================================================================
---- linux-2.6.23-rc7.orig/kernel/time/tick-broadcast.c	2007-09-20 21:06:21.000000000 +0200
-+++ linux-2.6.23-rc7/kernel/time/tick-broadcast.c	2007-09-20 21:06:26.000000000 +0200
-@@ -64,8 +64,9 @@ static void tick_broadcast_start_periodi
-  */
- int tick_check_broadcast_device(struct clock_event_device *dev)
- {
--	if (tick_broadcast_device.evtdev ||
--	    (dev->features & CLOCK_EVT_FEAT_C3STOP))
-+	if ((tick_broadcast_device.evtdev &&
-+	     tick_broadcast_device.evtdev->rating >= dev->rating) ||
-+	     (dev->features & CLOCK_EVT_FEAT_C3STOP))
- 		return 0;
+--- linux-2.6.23.orig/arch/x86_64/kernel/setup.c	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/setup.c	2007-10-10 09:43:08.000000000 +0200
+@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct
+ #endif
+ }
  
- 	clockevents_exchange_device(NULL, dev);
-@@ -530,11 +531,9 @@ static void tick_broadcast_clear_oneshot
-  */
- void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
++#define ENABLE_C1E_MASK		0x18000000
++#define CPUID_PROCESSOR_SIGNATURE	1
++#define CPUID_XFAM		0x0ff00000
++#define CPUID_XFAM_K8		0x00000000
++#define CPUID_XFAM_10H		0x00100000
++#define CPUID_XFAM_11H		0x00200000
++#define CPUID_XMOD		0x000f0000
++#define CPUID_XMOD_REV_F	0x00040000
++
++/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
++static __cpuinit int amd_apic_timer_broken(void)
++{
++	u32 lo, hi;
++	u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
++	switch (eax & CPUID_XFAM) {
++	case CPUID_XFAM_K8:
++		if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
++			break;
++	case CPUID_XFAM_10H:
++	case CPUID_XFAM_11H:
++		rdmsr(MSR_K8_ENABLE_C1E, lo, hi);
++		if (lo & ENABLE_C1E_MASK)
++			return 1;
++		break;
++	default:
++		/* err on the side of caution */
++		return 1;
++	}
++	return 0;
++}
++
+ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
  {
--	if (bc->mode != CLOCK_EVT_MODE_ONESHOT) {
--		bc->event_handler = tick_handle_oneshot_broadcast;
--		clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
--		bc->next_event.tv64 = KTIME_MAX;
--	}
-+	bc->event_handler = tick_handle_oneshot_broadcast;
-+	clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
-+	bc->next_event.tv64 = KTIME_MAX;
+ 	unsigned level;
+@@ -617,6 +648,9 @@ static void __cpuinit init_amd(struct cp
+ 	/* Family 10 doesn't support C states in MWAIT so don't use it */
+ 	if (c->x86 == 0x10 && !force_mwait)
+ 		clear_bit(X86_FEATURE_MWAIT, &c->x86_capability);
++
++	if (amd_apic_timer_broken())
++		disable_apic_timer = 1;
  }
  
- /*
-Index: linux-2.6.23-rc7/kernel/time/tick-common.c
+ static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
+Index: linux-2.6.23/kernel/time/tick-common.c
 ===================================================================
---- linux-2.6.23-rc7.orig/kernel/time/tick-common.c	2007-09-20 21:06:21.000000000 +0200
-+++ linux-2.6.23-rc7/kernel/time/tick-common.c	2007-09-20 21:06:26.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/tick-common.c	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/kernel/time/tick-common.c	2007-10-10 09:43:09.000000000 +0200
 @@ -200,7 +200,7 @@ static int tick_check_new_device(struct 
  
  	cpu = smp_processor_id();
@@ -6100,10 +6178,10 @@
  	spin_unlock_irqrestore(&tick_device_lock, flags);
  
  	return ret;
-Index: linux-2.6.23-rc7/arch/i386/kernel/quirks.c
+Index: linux-2.6.23/arch/i386/kernel/quirks.c
 ===================================================================
---- linux-2.6.23-rc7.orig/arch/i386/kernel/quirks.c	2007-09-20 21:06:21.000000000 +0200
-+++ linux-2.6.23-rc7/arch/i386/kernel/quirks.c	2007-09-20 21:06:27.000000000 +0200
+--- linux-2.6.23.orig/arch/i386/kernel/quirks.c	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/arch/i386/kernel/quirks.c	2007-10-10 09:43:09.000000000 +0200
 @@ -4,6 +4,8 @@
  #include <linux/pci.h>
  #include <linux/irq.h>
@@ -6394,10 +6472,10 @@
 +}
 +
 +#endif
-Index: linux-2.6.23-rc7/include/linux/pci_ids.h
+Index: linux-2.6.23/include/linux/pci_ids.h
 ===================================================================
---- linux-2.6.23-rc7.orig/include/linux/pci_ids.h	2007-09-20 21:06:21.000000000 +0200
-+++ linux-2.6.23-rc7/include/linux/pci_ids.h	2007-09-20 21:06:26.000000000 +0200
+--- linux-2.6.23.orig/include/linux/pci_ids.h	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/include/linux/pci_ids.h	2007-10-10 09:43:09.000000000 +0200
 @@ -2221,6 +2221,7 @@
  #define PCI_DEVICE_ID_INTEL_82801EB_5	0x24d5
  #define PCI_DEVICE_ID_INTEL_82801EB_6	0x24d6


--- linux-2.6-acpi-cpuidle-port-suspend-fixes.patch DELETED ---


--- linux-2.6-x86-AMD-c1e-disable-apic-timer.patch DELETED ---




More information about the fedora-extras-commits mailing list