rpms/kernel/F-8 kernel.spec, 1.228, 1.229 linux-2.6-highres-timers.patch, 1.17, 1.18
Dave Jones (davej)
fedora-extras-commits at redhat.com
Wed Oct 17 17:33:12 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9309
Modified Files:
kernel.spec linux-2.6-highres-timers.patch
Log Message:
* Wed Oct 17 2007 Dave Jones <davej at redhat.com>
- Update highres timers patch to 2.6.23-hrt3.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- kernel.spec 17 Oct 2007 16:35:04 -0000 1.228
+++ kernel.spec 17 Oct 2007 17:32:39 -0000 1.229
@@ -985,7 +985,7 @@
%if !%{nopatches}
-# patch-2.6.23-hrt2.patch
+# patch-2.6.23-hrt3.patch
ApplyPatch linux-2.6-highres-timers.patch
# Roland's utrace ptrace replacement.
@@ -1849,6 +1849,9 @@
%changelog
+* Wed Oct 17 2007 Dave Jones <davej at redhat.com>
+- Update highres timers patch to 2.6.23-hrt3.
+
* Wed Oct 17 2007 Chuck Ebbert <cebbert at redhat.com>
- Use upstream libata DMA disable patch
(libata.dma parameter replaces libata.pata_dma)
linux-2.6-highres-timers.patch:
Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-highres-timers.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-highres-timers.patch 15 Oct 2007 21:39:45 -0000 1.17
+++ linux-2.6-highres-timers.patch 17 Oct 2007 17:32:39 -0000 1.18
@@ -1,7 +1,7 @@
Index: linux-2.6.23/include/linux/clockchips.h
===================================================================
---- linux-2.6.23.orig/include/linux/clockchips.h 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/include/linux/clockchips.h 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/include/linux/clockchips.h 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/include/linux/clockchips.h 2007-10-17 00:18:35.000000000 +0200
@@ -8,7 +8,7 @@
#ifndef _LINUX_CLOCKCHIPS_H
#define _LINUX_CLOCKCHIPS_H
@@ -38,8 +38,8 @@
#endif
Index: linux-2.6.23/kernel/time/Kconfig
===================================================================
---- linux-2.6.23.orig/kernel/time/Kconfig 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/kernel/time/Kconfig 2007-10-14 22:48:53.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/Kconfig 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/kernel/time/Kconfig 2007-10-17 00:18:31.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.
@@ -51,8 +51,8 @@
+
Index: linux-2.6.23/kernel/time/Makefile
===================================================================
---- linux-2.6.23.orig/kernel/time/Makefile 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/kernel/time/Makefile 2007-10-14 22:48:53.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/Makefile 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/kernel/time/Makefile 2007-10-17 00:18:31.000000000 +0200
@@ -1,6 +1,6 @@
obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
@@ -63,8 +63,8 @@
obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o
Index: linux-2.6.23/kernel/time/clockevents.c
===================================================================
---- linux-2.6.23.orig/kernel/time/clockevents.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/kernel/time/clockevents.c 2007-10-14 22:48:53.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/clockevents.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/kernel/time/clockevents.c 2007-10-17 00:18:31.000000000 +0200
@@ -194,6 +194,7 @@ void clockevents_exchange_device(struct
local_irq_restore(flags);
}
@@ -81,8 +81,8 @@
+#endif
Index: linux-2.6.23/kernel/time/tick-broadcast.c
===================================================================
---- linux-2.6.23.orig/kernel/time/tick-broadcast.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/kernel/time/tick-broadcast.c 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/tick-broadcast.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/kernel/time/tick-broadcast.c 2007-10-17 00:18:35.000000000 +0200
@@ -64,8 +64,9 @@ static void tick_broadcast_start_periodi
*/
int tick_check_broadcast_device(struct clock_event_device *dev)
@@ -104,7 +104,7 @@
tick_do_periodic_broadcast();
/*
-@@ -218,26 +217,43 @@ static void tick_do_broadcast_on_off(voi
+@@ -218,26 +217,33 @@ static void tick_do_broadcast_on_off(voi
bc = tick_broadcast_device.evtdev;
/*
@@ -115,24 +115,12 @@
- if (!dev || !tick_device_is_functional(dev) ||
- !(dev->features & CLOCK_EVT_FEAT_C3STOP))
+ if (!dev || !(dev->features & CLOCK_EVT_FEAT_C3STOP))
++ goto out;
++
++ if (!tick_device_is_functional(dev))
goto out;
- if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_ON) {
-+ /*
-+ * Defect device ?
-+ */
-+ if (!tick_device_is_functional(dev)) {
-+ /*
-+ * AMD C1E wreckage fixup:
-+ *
-+ * Device was registered functional in the first
-+ * place. Now the secondary CPU detected the C1E
-+ * misfeature and notifies us to fix it up
-+ */
-+ if (*reason != CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
-+ goto out;
-+ }
-+
+ switch (*reason) {
+ case CLOCK_EVT_NOTIFY_BROADCAST_ON:
+ case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:
@@ -143,6 +131,8 @@
CLOCK_EVT_MODE_SHUTDOWN);
}
- } else {
++ if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
++ dev->features |= CLOCK_EVT_FEAT_DUMMY;
+ break;
+ case CLOCK_EVT_NOTIFY_BROADCAST_OFF:
if (cpu_isset(cpu, tick_broadcast_mask)) {
@@ -154,7 +144,7 @@
}
if (cpus_empty(tick_broadcast_mask))
-@@ -515,11 +531,9 @@ static void tick_broadcast_clear_oneshot
+@@ -515,11 +521,9 @@ static void tick_broadcast_clear_oneshot
*/
void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
@@ -171,8 +161,8 @@
/*
Index: linux-2.6.23/Documentation/00-INDEX
===================================================================
---- linux-2.6.23.orig/Documentation/00-INDEX 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/Documentation/00-INDEX 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/Documentation/00-INDEX 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/Documentation/00-INDEX 2007-10-17 00:18:32.000000000 +0200
@@ -62,6 +62,8 @@ VGA-softcursor.txt
- how to change your VGA cursor from a blinking underscore.
accounting/
@@ -185,7 +175,7 @@
Index: linux-2.6.23/Documentation/acpi/00-INDEX
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/Documentation/acpi/00-INDEX 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/00-INDEX 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,6 @@
+00-INDEX
+ - this file
@@ -196,7 +186,7 @@
Index: linux-2.6.23/Documentation/acpi/README.ACPI
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/Documentation/acpi/README.ACPI 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/README.ACPI 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,377 @@
+Developing ACPI for Linux - July 13, 2007
+------------------------------------------
@@ -578,7 +568,7 @@
Index: linux-2.6.23/Documentation/acpi/acpi_debugging.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/Documentation/acpi/acpi_debugging.txt 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/acpi_debugging.txt 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,173 @@
+How to debug ACPI (Advanced Configuration and Power Interface) Problems
+=======================================================================
@@ -755,8 +745,8 @@
+ acpi_debug_level=0x3 /* lower debug output again */
Index: linux-2.6.23/arch/i386/Kconfig
===================================================================
---- linux-2.6.23.orig/arch/i386/Kconfig 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/arch/i386/Kconfig 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/arch/i386/Kconfig 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/arch/i386/Kconfig 2007-10-17 00:18:32.000000000 +0200
@@ -1069,6 +1069,8 @@ endif # APM
source "arch/i386/kernel/cpu/cpufreq/Kconfig"
@@ -768,8 +758,8 @@
menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
Index: linux-2.6.23/arch/x86_64/Kconfig
===================================================================
---- linux-2.6.23.orig/arch/x86_64/Kconfig 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/Kconfig 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/Kconfig 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/arch/x86_64/Kconfig 2007-10-17 00:18:33.000000000 +0200
@@ -28,6 +28,18 @@ config GENERIC_TIME
bool
default y
@@ -820,8 +810,8 @@
menu "Bus options (PCI etc.)"
Index: linux-2.6.23/drivers/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/Makefile 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/Makefile 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/drivers/Makefile 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/Makefile 2007-10-17 00:18:32.000000000 +0200
@@ -76,6 +76,7 @@ obj-$(CONFIG_MCA) += mca/
obj-$(CONFIG_EISA) += eisa/
obj-$(CONFIG_LGUEST_GUEST) += lguest/
@@ -832,8 +822,8 @@
obj-$(CONFIG_INFINIBAND) += infiniband/
Index: linux-2.6.23/drivers/acpi/osl.c
===================================================================
---- linux-2.6.23.orig/drivers/acpi/osl.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/acpi/osl.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/drivers/acpi/osl.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/acpi/osl.c 2007-10-17 00:18:32.000000000 +0200
@@ -1043,14 +1043,6 @@ static int __init acpi_wake_gpes_always_
__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
@@ -851,8 +841,8 @@
* handle is a pointer to the spinlock_t.
Index: linux-2.6.23/drivers/acpi/processor_core.c
===================================================================
---- linux-2.6.23.orig/drivers/acpi/processor_core.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/acpi/processor_core.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/drivers/acpi/processor_core.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/acpi/processor_core.c 2007-10-17 00:18:32.000000000 +0200
@@ -44,6 +44,7 @@
#include <linux/seq_file.h>
#include <linux/dmi.h>
@@ -910,8 +900,8 @@
return;
Index: linux-2.6.23/drivers/acpi/processor_idle.c
===================================================================
---- linux-2.6.23.orig/drivers/acpi/processor_idle.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/acpi/processor_idle.c 2007-10-14 22:48:56.000000000 +0200
+--- linux-2.6.23.orig/drivers/acpi/processor_idle.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/acpi/processor_idle.c 2007-10-17 00:18:34.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/sched.h> /* need_resched() */
#include <linux/latency.h>
@@ -2080,7 +2070,7 @@
Index: linux-2.6.23/drivers/cpuidle/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/Kconfig 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/Kconfig 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,39 @@
+menu "CPU idle PM support"
+
@@ -2124,7 +2114,7 @@
Index: linux-2.6.23/drivers/cpuidle/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/Makefile 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/Makefile 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for cpuidle.
@@ -2134,7 +2124,7 @@
Index: linux-2.6.23/drivers/cpuidle/cpuidle.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/cpuidle.c 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/cpuidle.c 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,295 @@
+/*
+ * cpuidle.c - core cpuidle infrastructure
@@ -2434,7 +2424,7 @@
Index: linux-2.6.23/drivers/cpuidle/cpuidle.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/cpuidle.h 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/cpuidle.h 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * cpuidle.h - The internal header file
@@ -2472,7 +2462,7 @@
Index: linux-2.6.23/drivers/cpuidle/driver.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/driver.c 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/driver.c 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * driver.c - driver support
@@ -2533,7 +2523,7 @@
Index: linux-2.6.23/drivers/cpuidle/governor.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/governor.c 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governor.c 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,141 @@
+/*
+ * governor.c - governor support
@@ -2679,7 +2669,7 @@
Index: linux-2.6.23/drivers/cpuidle/governors/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/governors/Makefile 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governors/Makefile 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,6 @@
+#
+# Makefile for cpuidle governors.
@@ -2690,7 +2680,7 @@
Index: linux-2.6.23/drivers/cpuidle/governors/ladder.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/governors/ladder.c 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governors/ladder.c 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,166 @@
+/*
+ * ladder.c - the residency ladder algorithm
@@ -2861,7 +2851,7 @@
Index: linux-2.6.23/drivers/cpuidle/governors/menu.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/governors/menu.c 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governors/menu.c 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,137 @@
+/*
+ * menu.c - the menu idle governor
@@ -3003,7 +2993,7 @@
Index: linux-2.6.23/drivers/cpuidle/sysfs.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/cpuidle/sysfs.c 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/sysfs.c 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,361 @@
+/*
+ * sysfs.c - sysfs support
@@ -3368,8 +3358,8 @@
+}
Index: linux-2.6.23/drivers/misc/sony-laptop.c
===================================================================
---- linux-2.6.23.orig/drivers/misc/sony-laptop.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/misc/sony-laptop.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/drivers/misc/sony-laptop.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/misc/sony-laptop.c 2007-10-17 00:18:32.000000000 +0200
@@ -1173,7 +1173,8 @@ static struct acpi_driver sony_nc_driver
#define SONYPI_TYPE3_OFFSET 0x12
@@ -3698,8 +3688,8 @@
sonypi_compat_exit();
Index: linux-2.6.23/drivers/net/wireless/ipw2100.c
===================================================================
---- linux-2.6.23.orig/drivers/net/wireless/ipw2100.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/net/wireless/ipw2100.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/drivers/net/wireless/ipw2100.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/net/wireless/ipw2100.c 2007-10-17 00:18:32.000000000 +0200
@@ -1858,14 +1858,6 @@ static void ipw2100_down(struct ipw2100_
modify_acceptable_latency("ipw2100", INFINITE_LATENCY);
@@ -3756,8 +3746,8 @@
write_register(priv->net_dev, IPW_REG_RESET_REG,
Index: linux-2.6.23/drivers/net/wireless/ipw2100.h
===================================================================
---- linux-2.6.23.orig/drivers/net/wireless/ipw2100.h 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/drivers/net/wireless/ipw2100.h 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/drivers/net/wireless/ipw2100.h 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/drivers/net/wireless/ipw2100.h 2007-10-17 00:18:32.000000000 +0200
@@ -479,7 +479,6 @@ enum {
#define CFG_ASSOCIATE (1<<6)
#define CFG_FIXED_RATE (1<<7)
@@ -3776,8 +3766,8 @@
unsigned long last_reset;
Index: linux-2.6.23/include/acpi/processor.h
===================================================================
---- linux-2.6.23.orig/include/acpi/processor.h 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/include/acpi/processor.h 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/include/acpi/processor.h 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/include/acpi/processor.h 2007-10-17 00:18:32.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/kernel.h>
@@ -3815,8 +3805,8 @@
extern struct file_operations acpi_processor_limit_fops;
Index: linux-2.6.23/include/linux/acpi.h
===================================================================
---- linux-2.6.23.orig/include/linux/acpi.h 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/include/linux/acpi.h 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/include/linux/acpi.h 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/include/linux/acpi.h 2007-10-17 00:18:32.000000000 +0200
@@ -189,32 +189,6 @@ extern int ec_transaction(u8 command,
extern int acpi_blacklisted(void);
extern void acpi_bios_year(char *s);
@@ -3853,7 +3843,7 @@
Index: linux-2.6.23/include/linux/cpuidle.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/include/linux/cpuidle.h 2007-10-14 22:48:54.000000000 +0200
++++ linux-2.6.23/include/linux/cpuidle.h 2007-10-17 00:18:32.000000000 +0200
@@ -0,0 +1,180 @@
+/*
+ * cpuidle.h - a generic framework for CPU idle power management
@@ -4037,8 +4027,8 @@
+#endif /* _LINUX_CPUIDLE_H */
Index: linux-2.6.23/include/linux/tick.h
===================================================================
---- linux-2.6.23.orig/include/linux/tick.h 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/include/linux/tick.h 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/include/linux/tick.h 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/include/linux/tick.h 2007-10-17 00:18:32.000000000 +0200
@@ -40,6 +40,7 @@ enum tick_nohz_mode {
* @idle_sleeps: Number of idle calls, where the sched tick was stopped
* @idle_entrytime: Time when the idle call was entered
@@ -4075,8 +4065,8 @@
#endif
Index: linux-2.6.23/kernel/time/tick-sched.c
===================================================================
---- linux-2.6.23.orig/kernel/time/tick-sched.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/kernel/time/tick-sched.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/tick-sched.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/kernel/time/tick-sched.c 2007-10-17 00:18:32.000000000 +0200
@@ -153,6 +153,7 @@ void tick_nohz_stop_sched_tick(void)
unsigned long seq, last_jiffies, next_jiffies, delta_jiffies, flags;
struct tick_sched *ts;
@@ -4114,7 +4104,7 @@
* Restart the idle tick when the CPU is woken up from idle
Index: linux-2.6.23/arch/x86_64/kernel/hpet.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/hpet.c 2007-10-14 22:48:53.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/hpet.c 2007-10-17 00:18:31.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,493 +0,0 @@
-#include <linux/kernel.h>
@@ -4612,8 +4602,8 @@
-__setup("nohpet", nohpet_setup);
Index: linux-2.6.23/arch/x86_64/kernel/time.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/time.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/time.c 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/time.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/time.c 2007-10-17 00:18:33.000000000 +0200
@@ -28,11 +28,12 @@
#include <linux/cpu.h>
#include <linux/kallsyms.h>
@@ -4842,8 +4832,8 @@
-device_initcall(time_init_device);
Index: linux-2.6.23/arch/x86_64/kernel/tsc.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/tsc.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/tsc.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/tsc.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/tsc.c 2007-10-17 00:18:32.000000000 +0200
@@ -6,7 +6,9 @@
#include <linux/time.h>
#include <linux/acpi.h>
@@ -4951,8 +4941,8 @@
* over all CPUs.
Index: linux-2.6.23/include/asm-i386/tsc.h
===================================================================
---- linux-2.6.23.orig/include/asm-i386/tsc.h 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/tsc.h 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/include/asm-i386/tsc.h 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/include/asm-i386/tsc.h 2007-10-17 00:18:32.000000000 +0200
@@ -72,4 +72,8 @@ int check_tsc_unstable(void);
extern void check_tsc_sync_source(int cpu);
extern void check_tsc_sync_target(void);
@@ -4964,8 +4954,8 @@
#endif
Index: linux-2.6.23/arch/i386/kernel/hpet.c
===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/hpet.c 2007-10-14 22:48:53.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/hpet.c 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/arch/i386/kernel/hpet.c 2007-10-17 00:18:31.000000000 +0200
++++ linux-2.6.23/arch/i386/kernel/hpet.c 2007-10-17 00:18:35.000000000 +0200
@@ -1,5 +1,6 @@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
@@ -5349,8 +5339,8 @@
Index: linux-2.6.23/arch/i386/kernel/i8253.c
===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/i8253.c 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/i8253.c 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/arch/i386/kernel/i8253.c 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/arch/i386/kernel/i8253.c 2007-10-17 00:18:32.000000000 +0200
@@ -13,7 +13,6 @@
#include <asm/delay.h>
#include <asm/i8253.h>
@@ -5375,8 +5365,8 @@
+#endif
Index: linux-2.6.23/include/asm-i386/i8253.h
===================================================================
---- linux-2.6.23.orig/include/asm-i386/i8253.h 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/i8253.h 2007-10-14 22:48:56.000000000 +0200
+--- linux-2.6.23.orig/include/asm-i386/i8253.h 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/include/asm-i386/i8253.h 2007-10-17 00:18:34.000000000 +0200
@@ -1,8 +1,6 @@
#ifndef __ASM_I8253_H__
#define __ASM_I8253_H__
@@ -5388,8 +5378,8 @@
#define PIT_CH0 0x40
Index: linux-2.6.23/include/asm-x86_64/i8253.h
===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/i8253.h 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/i8253.h 2007-10-14 22:48:54.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/i8253.h 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/i8253.h 2007-10-17 00:18:32.000000000 +0200
@@ -1,6 +1,2 @@
-#ifndef __ASM_I8253_H__
-#define __ASM_I8253_H__
@@ -5401,8 +5391,8 @@
+#include <asm/8253pit.h>
Index: linux-2.6.23/arch/x86_64/kernel/apic.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/apic.c 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/apic.c 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/apic.c 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/apic.c 2007-10-17 00:18:35.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/sysdev.h>
#include <linux/module.h>
@@ -5611,7 +5601,7 @@
apic_start = apic_read(APIC_TMCCT);
#ifdef CONFIG_X86_PM_TIMER
-@@ -867,122 +907,87 @@ static int __init calibrate_APIC_clock(v
+@@ -867,122 +907,84 @@ static int __init calibrate_APIC_clock(v
result = (apic_start - apic) * 1000L * tsc_khz /
(tsc - tsc_start);
}
@@ -5744,8 +5734,7 @@
{
- int cpu = smp_processor_id();
- cpumask_t mask;
-+ struct clock_event_device *levt = &per_cpu(lapic_events, boot_cpu_id);
-
+-
- cpus_and(mask, cpu_online_map, timer_interrupt_broadcast_ipi_mask);
+ if (!disable_apic_timer ||
+ (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY))
@@ -5758,7 +5747,6 @@
- }
+ printk(KERN_INFO "AMD C1E detected late. Force timer broadcast.\n");
+ lapic_clockevent.features |= CLOCK_EVT_FEAT_DUMMY;
-+ levt->features |= CLOCK_EVT_FEAT_DUMMY;
- if (!cpus_empty(mask)) {
- send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
@@ -5786,7 +5774,7 @@
int setup_profiling_timer(unsigned int multiplier)
{
-@@ -997,8 +1002,6 @@ void setup_APIC_extended_lvt(unsigned ch
+@@ -997,8 +999,6 @@ void setup_APIC_extended_lvt(unsigned ch
apic_write(reg, v);
}
@@ -5795,7 +5783,7 @@
/*
* Local timer interrupt handler. It does both profiling and
* process statistics/rescheduling.
-@@ -1011,22 +1014,34 @@ void setup_APIC_extended_lvt(unsigned ch
+@@ -1011,22 +1011,34 @@ void setup_APIC_extended_lvt(unsigned ch
void smp_local_timer_interrupt(void)
{
@@ -5843,7 +5831,7 @@
}
/*
-@@ -1042,11 +1057,6 @@ void smp_apic_timer_interrupt(struct pt_
+@@ -1042,11 +1054,6 @@ void smp_apic_timer_interrupt(struct pt_
struct pt_regs *old_regs = set_irq_regs(regs);
/*
@@ -5855,7 +5843,7 @@
* NOTE! We'd better ACK the irq immediately,
* because timer handling can be slow.
*/
-@@ -1126,7 +1136,6 @@ asmlinkage void smp_spurious_interrupt(v
+@@ -1126,7 +1133,6 @@ asmlinkage void smp_spurious_interrupt(v
v = apic_read(APIC_ISR + ((SPURIOUS_APIC_VECTOR & ~0x1f) >> 1));
if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
ack_APIC_irq();
@@ -5863,7 +5851,7 @@
irq_exit();
}
-@@ -1225,29 +1234,13 @@ static __init int setup_noapictimer(char
+@@ -1225,29 +1231,13 @@ static __init int setup_noapictimer(char
disable_apic_timer = 1;
return 1;
}
@@ -5897,8 +5885,8 @@
-
Index: linux-2.6.23/arch/x86_64/kernel/process.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/process.c 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/process.c 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/process.c 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/process.c 2007-10-17 00:18:33.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/notifier.h>
#include <linux/kprobes.h>
@@ -5926,8 +5914,8 @@
preempt_disable();
Index: linux-2.6.23/arch/x86_64/kernel/Makefile
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/Makefile 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/Makefile 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/Makefile 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/Makefile 2007-10-17 00:18:33.000000000 +0200
@@ -9,7 +9,7 @@ obj-y := process.o signal.o entry.o trap
x8664_ksyms.o i387.o syscall.o vsyscall.o \
setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
@@ -5948,8 +5936,8 @@
cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o
Index: linux-2.6.23/arch/x86_64/kernel/i8259.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/i8259.c 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/i8259.c 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/i8259.c 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/i8259.c 2007-10-17 00:18:33.000000000 +0200
@@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
}
}
@@ -6012,8 +6000,8 @@
}
Index: linux-2.6.23/arch/x86_64/kernel/smpboot.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/smpboot.c 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/smpboot.c 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/smpboot.c 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/smpboot.c 2007-10-17 00:18:35.000000000 +0200
@@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
local_irq_disable();
Dprintk("Stack at about %p\n",&cpuid);
@@ -6062,8 +6050,8 @@
Index: linux-2.6.23/include/asm-x86_64/hpet.h
===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/hpet.h 2007-10-14 22:48:52.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/hpet.h 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/hpet.h 2007-10-17 00:18:30.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/hpet.h 2007-10-17 00:18:33.000000000 +0200
@@ -1,18 +1,2 @@
-#ifndef _ASM_X8664_HPET_H
-#define _ASM_X8664_HPET_H 1
@@ -6085,8 +6073,8 @@
-#endif
Index: linux-2.6.23/include/asm-x86_64/apic.h
===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/apic.h 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/apic.h 2007-10-14 22:48:56.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/apic.h 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/apic.h 2007-10-17 00:18:34.000000000 +0200
@@ -19,7 +19,7 @@
extern int apic_verbosity;
extern int apic_runs_main_timer;
@@ -6118,8 +6106,8 @@
extern unsigned boot_cpu_id;
Index: linux-2.6.23/include/asm-x86_64/proto.h
===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/proto.h 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/proto.h 2007-10-14 22:48:55.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/proto.h 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/proto.h 2007-10-17 00:18:33.000000000 +0200
@@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
extern void load_gs_index(unsigned gs);
@@ -6147,8 +6135,8 @@
Index: linux-2.6.23/include/linux/jiffies.h
===================================================================
---- linux-2.6.23.orig/include/linux/jiffies.h 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/include/linux/jiffies.h 2007-10-14 22:48:56.000000000 +0200
+--- linux-2.6.23.orig/include/linux/jiffies.h 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/include/linux/jiffies.h 2007-10-17 00:18:34.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 */
@@ -6174,8 +6162,8 @@
Index: linux-2.6.23/include/asm-i386/hpet.h
===================================================================
---- linux-2.6.23.orig/include/asm-i386/hpet.h 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/hpet.h 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/include/asm-i386/hpet.h 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/include/asm-i386/hpet.h 2007-10-17 00:18:35.000000000 +0200
@@ -64,8 +64,11 @@
/* hpet memory map physical address */
@@ -6198,8 +6186,8 @@
#endif /* _I386_HPET_H */
Index: linux-2.6.23/include/asm-x86_64/vsyscall.h
===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/vsyscall.h 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/vsyscall.h 2007-10-14 22:48:56.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86_64/vsyscall.h 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/include/asm-x86_64/vsyscall.h 2007-10-17 00:18:34.000000000 +0200
@@ -29,9 +29,6 @@ enum vsyscall_num {
#define VGETCPU_RDTSCP 1
#define VGETCPU_LSL 2
@@ -6212,8 +6200,8 @@
Index: linux-2.6.23/arch/x86_64/kernel/setup.c
===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/setup.c 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/setup.c 2007-10-14 22:48:56.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/setup.c 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/arch/x86_64/kernel/setup.c 2007-10-17 00:18:34.000000000 +0200
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct
#endif
}
@@ -6264,8 +6252,8 @@
static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
Index: linux-2.6.23/kernel/time/tick-common.c
===================================================================
---- linux-2.6.23.orig/kernel/time/tick-common.c 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/kernel/time/tick-common.c 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/kernel/time/tick-common.c 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/kernel/time/tick-common.c 2007-10-17 00:18:35.000000000 +0200
@@ -200,7 +200,7 @@ static int tick_check_new_device(struct
cpu = smp_processor_id();
@@ -6294,8 +6282,8 @@
Index: linux-2.6.23/arch/i386/kernel/quirks.c
===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/quirks.c 2007-10-14 22:48:51.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/quirks.c 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/arch/i386/kernel/quirks.c 2007-10-17 00:18:29.000000000 +0200
++++ linux-2.6.23/arch/i386/kernel/quirks.c 2007-10-17 00:18:35.000000000 +0200
@@ -4,6 +4,8 @@
#include <linux/pci.h>
#include <linux/irq.h>
@@ -6588,8 +6576,8 @@
+#endif
Index: linux-2.6.23/include/linux/pci_ids.h
===================================================================
---- linux-2.6.23.orig/include/linux/pci_ids.h 2007-10-14 22:48:50.000000000 +0200
-+++ linux-2.6.23/include/linux/pci_ids.h 2007-10-14 22:48:57.000000000 +0200
+--- linux-2.6.23.orig/include/linux/pci_ids.h 2007-10-17 00:18:28.000000000 +0200
++++ linux-2.6.23/include/linux/pci_ids.h 2007-10-17 00:18:35.000000000 +0200
@@ -2221,6 +2221,7 @@
#define PCI_DEVICE_ID_INTEL_82801EB_5 0x24d5
#define PCI_DEVICE_ID_INTEL_82801EB_6 0x24d6
More information about the fedora-extras-commits
mailing list