rpms/kernel/F-8 kernel.spec, 1.222, 1.223 linux-2.6-highres-timers.patch, 1.16, 1.17
Dave Jones (davej)
fedora-extras-commits at redhat.com
Mon Oct 15 21:40:19 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24221
Modified Files:
kernel.spec linux-2.6-highres-timers.patch
Log Message:
* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
- Update highres timers patch to 2.6.23-hrt2.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- kernel.spec 15 Oct 2007 21:06:35 -0000 1.222
+++ kernel.spec 15 Oct 2007 21:39:45 -0000 1.223
@@ -979,7 +979,7 @@
%if !%{nopatches}
-# patch-2.6.23-hrt1.patch
+# patch-2.6.23-hrt2.patch
ApplyPatch linux-2.6-highres-timers.patch
# Roland's utrace ptrace replacement.
@@ -1841,6 +1841,9 @@
- fix thinkpad key events for volume/brightness
* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
+- Update highres timers patch to 2.6.23-hrt2.
+
+* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
- Reenable 'quiet' mode.
* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-highres-timers.patch 10 Oct 2007 19:50:38 -0000 1.16
+++ linux-2.6-highres-timers.patch 15 Oct 2007 21:39:45 -0000 1.17
@@ -1,7 +1,7 @@
Index: linux-2.6.23/include/linux/clockchips.h
===================================================================
---- 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
+--- 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
@@ -8,7 +8,7 @@
#ifndef _LINUX_CLOCKCHIPS_H
#define _LINUX_CLOCKCHIPS_H
@@ -11,7 +11,15 @@
#include <linux/clocksource.h>
#include <linux/cpumask.h>
-@@ -126,11 +126,14 @@ extern int clockevents_register_notifier
+@@ -31,6 +31,7 @@ enum clock_event_nofitiers {
+ CLOCK_EVT_NOTIFY_ADD,
+ CLOCK_EVT_NOTIFY_BROADCAST_ON,
+ CLOCK_EVT_NOTIFY_BROADCAST_OFF,
++ CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
+ CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
+ CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
+ CLOCK_EVT_NOTIFY_SUSPEND,
+@@ -126,11 +127,14 @@ extern int clockevents_register_notifier
extern int clockevents_program_event(struct clock_event_device *dev,
ktime_t expires, ktime_t now);
@@ -30,8 +38,8 @@
#endif
Index: linux-2.6.23/kernel/time/Kconfig
===================================================================
---- 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
+--- 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
@@ -23,3 +23,8 @@ config HIGH_RES_TIMERS
hardware is not capable then this option only increases
the size of the kernel image.
@@ -43,8 +51,8 @@
+
Index: linux-2.6.23/kernel/time/Makefile
===================================================================
---- 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
+--- 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
@@ -1,6 +1,6 @@
obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
@@ -55,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/kernel/time/clockevents.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -194,6 +194,7 @@ void clockevents_exchange_device(struct
local_irq_restore(flags);
}
@@ -73,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/kernel/time/tick-broadcast.c 2007-10-10 09:43:09.000000000 +0200
+--- 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
@@ -64,8 +64,9 @@ static void tick_broadcast_start_periodi
*/
int tick_check_broadcast_device(struct clock_event_device *dev)
@@ -96,7 +104,57 @@
tick_do_periodic_broadcast();
/*
-@@ -515,11 +514,9 @@ static void tick_broadcast_clear_oneshot
+@@ -218,26 +217,43 @@ static void tick_do_broadcast_on_off(voi
+ bc = tick_broadcast_device.evtdev;
+
+ /*
+- * Is the device in broadcast mode forever or is it not
+- * affected by the powerstate ?
++ * Is the device not affected by the powerstate ?
+ */
+- if (!dev || !tick_device_is_functional(dev) ||
+- !(dev->features & CLOCK_EVT_FEAT_C3STOP))
++ if (!dev || !(dev->features & CLOCK_EVT_FEAT_C3STOP))
+ 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:
+ if (!cpu_isset(cpu, tick_broadcast_mask)) {
+ cpu_set(cpu, tick_broadcast_mask);
+ if (td->mode == TICKDEV_MODE_PERIODIC)
+ clockevents_set_mode(dev,
+ CLOCK_EVT_MODE_SHUTDOWN);
+ }
+- } else {
++ break;
++ case CLOCK_EVT_NOTIFY_BROADCAST_OFF:
+ if (cpu_isset(cpu, tick_broadcast_mask)) {
+ cpu_clear(cpu, tick_broadcast_mask);
+ if (td->mode == TICKDEV_MODE_PERIODIC)
+ tick_setup_periodic(dev, 0);
+ }
++ break;
+ }
+
+ if (cpus_empty(tick_broadcast_mask))
+@@ -515,11 +531,9 @@ static void tick_broadcast_clear_oneshot
*/
void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
@@ -113,8 +171,8 @@
/*
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
+--- 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
@@ -62,6 +62,8 @@ VGA-softcursor.txt
- how to change your VGA cursor from a blinking underscore.
accounting/
@@ -127,7 +185,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/00-INDEX 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,6 @@
+00-INDEX
+ - this file
@@ -138,7 +196,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/README.ACPI 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,377 @@
+Developing ACPI for Linux - July 13, 2007
+------------------------------------------
@@ -520,7 +578,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/Documentation/acpi/acpi_debugging.txt 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,173 @@
+How to debug ACPI (Advanced Configuration and Power Interface) Problems
+=======================================================================
@@ -697,8 +755,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/arch/i386/Kconfig 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -1069,6 +1069,8 @@ endif # APM
source "arch/i386/kernel/cpu/cpufreq/Kconfig"
@@ -710,8 +768,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/Kconfig 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -28,6 +28,18 @@ config GENERIC_TIME
bool
default y
@@ -762,8 +820,8 @@
menu "Bus options (PCI etc.)"
Index: linux-2.6.23/drivers/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/Makefile 2007-10-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/Makefile 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -76,6 +76,7 @@ obj-$(CONFIG_MCA) += mca/
obj-$(CONFIG_EISA) += eisa/
obj-$(CONFIG_LGUEST_GUEST) += lguest/
@@ -774,8 +832,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/acpi/osl.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -1043,14 +1043,6 @@ static int __init acpi_wake_gpes_always_
__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
@@ -793,8 +851,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/acpi/processor_core.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -44,6 +44,7 @@
#include <linux/seq_file.h>
#include <linux/dmi.h>
@@ -852,8 +910,8 @@
return;
Index: linux-2.6.23/drivers/acpi/processor_idle.c
===================================================================
---- linux-2.6.23.orig/drivers/acpi/processor_idle.c 2007-10-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/acpi/processor_idle.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -40,6 +40,7 @@
#include <linux/sched.h> /* need_resched() */
#include <linux/latency.h>
@@ -2022,7 +2080,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/Kconfig 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,39 @@
+menu "CPU idle PM support"
+
@@ -2066,7 +2124,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/Makefile 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for cpuidle.
@@ -2076,7 +2134,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/cpuidle.c 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,295 @@
+/*
+ * cpuidle.c - core cpuidle infrastructure
@@ -2376,7 +2434,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/cpuidle.h 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * cpuidle.h - The internal header file
@@ -2414,7 +2472,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/driver.c 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * driver.c - driver support
@@ -2475,7 +2533,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governor.c 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,141 @@
+/*
+ * governor.c - governor support
@@ -2621,7 +2679,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governors/Makefile 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,6 @@
+#
+# Makefile for cpuidle governors.
@@ -2632,7 +2690,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governors/ladder.c 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,166 @@
+/*
+ * ladder.c - the residency ladder algorithm
@@ -2803,7 +2861,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/governors/menu.c 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,137 @@
+/*
+ * menu.c - the menu idle governor
@@ -2945,7 +3003,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/drivers/cpuidle/sysfs.c 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,361 @@
+/*
+ * sysfs.c - sysfs support
@@ -3310,8 +3368,8 @@
+}
Index: linux-2.6.23/drivers/misc/sony-laptop.c
===================================================================
---- linux-2.6.23.orig/drivers/misc/sony-laptop.c 2007-10-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/misc/sony-laptop.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -1173,7 +1173,8 @@ static struct acpi_driver sony_nc_driver
#define SONYPI_TYPE3_OFFSET 0x12
@@ -3640,8 +3698,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/net/wireless/ipw2100.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -1858,14 +1858,6 @@ static void ipw2100_down(struct ipw2100_
modify_acceptable_latency("ipw2100", INFINITE_LATENCY);
@@ -3698,8 +3756,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/drivers/net/wireless/ipw2100.h 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -479,7 +479,6 @@ enum {
#define CFG_ASSOCIATE (1<<6)
#define CFG_FIXED_RATE (1<<7)
@@ -3718,8 +3776,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/include/acpi/processor.h 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -3,6 +3,7 @@
#include <linux/kernel.h>
@@ -3757,8 +3815,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/include/linux/acpi.h 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -189,32 +189,6 @@ extern int ec_transaction(u8 command,
extern int acpi_blacklisted(void);
extern void acpi_bios_year(char *s);
@@ -3795,7 +3853,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-10 09:43:06.000000000 +0200
++++ linux-2.6.23/include/linux/cpuidle.h 2007-10-14 22:48:54.000000000 +0200
@@ -0,0 +1,180 @@
+/*
+ * cpuidle.h - a generic framework for CPU idle power management
@@ -3979,8 +4037,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-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/include/linux/tick.h 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -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
@@ -4017,8 +4075,8 @@
#endif
Index: linux-2.6.23/kernel/time/tick-sched.c
===================================================================
---- linux-2.6.23.orig/kernel/time/tick-sched.c 2007-10-10 09:43:06.000000000 +0200
-+++ linux-2.6.23/kernel/time/tick-sched.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -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;
@@ -4056,7 +4114,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-10 09:43:05.000000000 +0200
+--- linux-2.6.23.orig/arch/x86_64/kernel/hpet.c 2007-10-14 22:48:53.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,493 +0,0 @@
-#include <linux/kernel.h>
@@ -4554,8 +4612,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-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/time.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -28,11 +28,12 @@
#include <linux/cpu.h>
#include <linux/kallsyms.h>
@@ -4784,8 +4842,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-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/tsc.c 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -6,7 +6,9 @@
#include <linux/time.h>
#include <linux/acpi.h>
@@ -4893,8 +4951,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-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/tsc.h 2007-10-10 09:43:06.000000000 +0200
+--- 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
@@ -72,4 +72,8 @@ int check_tsc_unstable(void);
extern void check_tsc_sync_source(int cpu);
extern void check_tsc_sync_target(void);
@@ -4906,8 +4964,8 @@
#endif
Index: linux-2.6.23/arch/i386/kernel/hpet.c
===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/hpet.c 2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/hpet.c 2007-10-10 09:43:09.000000000 +0200
+--- 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
@@ -1,5 +1,6 @@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
@@ -5291,8 +5349,8 @@
Index: linux-2.6.23/arch/i386/kernel/i8253.c
===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/i8253.c 2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/i8253.c 2007-10-10 09:43:07.000000000 +0200
+--- 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
@@ -13,7 +13,6 @@
#include <asm/delay.h>
#include <asm/i8253.h>
@@ -5317,8 +5375,8 @@
+#endif
Index: linux-2.6.23/include/asm-i386/i8253.h
===================================================================
---- linux-2.6.23.orig/include/asm-i386/i8253.h 2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/i8253.h 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -1,8 +1,6 @@
#ifndef __ASM_I8253_H__
#define __ASM_I8253_H__
@@ -5330,8 +5388,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-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/i8253.h 2007-10-10 09:43:07.000000000 +0200
+--- 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
@@ -1,6 +1,2 @@
-#ifndef __ASM_I8253_H__
-#define __ASM_I8253_H__
@@ -5343,8 +5401,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-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/apic.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -25,6 +25,7 @@
#include <linux/sysdev.h>
#include <linux/module.h>
@@ -5553,7 +5611,7 @@
apic_start = apic_read(APIC_TMCCT);
#ifdef CONFIG_X86_PM_TIMER
-@@ -867,123 +907,62 @@ static int __init calibrate_APIC_clock(v
+@@ -867,122 +907,87 @@ static int __init calibrate_APIC_clock(v
result = (apic_start - apic) * 1000L * tsc_khz /
(tsc - tsc_start);
}
@@ -5609,24 +5667,17 @@
+ * device.
*/
- setup_APIC_timer(calibration_result);
-+ if (nmi_watchdog != NMI_IO_APIC)
-+ lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
-+ else
-+ printk(KERN_WARNING "APIC timer registered as dummy,"
-+ " due to nmi_watchdog=1!\n");
-
+-
- local_irq_enable();
-+ setup_APIC_timer();
- }
-
- void __cpuinit setup_secondary_APIC_clock(void)
- {
+-}
+-
+-void __cpuinit setup_secondary_APIC_clock(void)
+-{
- local_irq_disable(); /* FIXME: Do we need this? --RR */
- setup_APIC_timer(calibration_result);
- local_irq_enable();
-+ setup_APIC_timer();
- }
-
+-}
+-
-void disable_APIC_timer(void)
-{
- if (using_apic_timer) {
@@ -5665,35 +5716,61 @@
-{
- cpumask_t mask = *(cpumask_t *)cpumask;
- int cpu = smp_processor_id();
--
++ if (nmi_watchdog != NMI_IO_APIC)
++ lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
++ else
++ printk(KERN_WARNING "APIC timer registered as dummy,"
++ " due to nmi_watchdog=1!\n");
+
- if (cpu_isset(cpu, mask) &&
- !cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask)) {
- disable_APIC_timer();
- cpu_set(cpu, timer_interrupt_broadcast_ipi_mask);
- }
--}
++ setup_APIC_timer();
+ }
-EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
--
+
-void smp_send_timer_broadcast_ipi(void)
--{
++/*
++ * AMD C1E enabled CPUs have a real nasty problem: Some BIOSes set the
++ * C1E flag only in the secondary CPU, so when we detect the wreckage
++ * we already have enabled the boot CPU local apic timer. Check, if
++ * disable_apic_timer is set and the DUMMY flag is cleared. If yes,
++ * set the DUMMY flag again and force the broadcast mode in the
++ * clockevents layer.
++ */
++void __cpuinit check_boot_apic_timer_broadcast(void)
+ {
- 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))
++ return;
+
- if (cpu_isset(cpu, mask)) {
- cpu_clear(cpu, mask);
- add_pda(apic_timer_irqs, 1);
- smp_local_timer_interrupt();
- }
--
++ 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);
- }
--}
--
++ local_irq_enable();
++ clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, &boot_cpu_id);
++ local_irq_disable();
+ }
+
-void switch_ipi_to_APIC_timer(void *cpumask)
--{
++void __cpuinit setup_secondary_APIC_clock(void)
+ {
- cpumask_t mask = *(cpumask_t *)cpumask;
- int cpu = smp_processor_id();
-
@@ -5702,13 +5779,14 @@
- cpu_clear(cpu, timer_interrupt_broadcast_ipi_mask);
- enable_APIC_timer();
- }
--}
++ check_boot_apic_timer_broadcast();
++ setup_APIC_timer();
+ }
-EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
--
+
int setup_profiling_timer(unsigned int multiplier)
{
- return -EINVAL;
-@@ -997,8 +976,6 @@ void setup_APIC_extended_lvt(unsigned ch
+@@ -997,8 +1002,6 @@ void setup_APIC_extended_lvt(unsigned ch
apic_write(reg, v);
}
@@ -5717,7 +5795,7 @@
/*
* Local timer interrupt handler. It does both profiling and
* process statistics/rescheduling.
-@@ -1011,22 +988,34 @@ void setup_APIC_extended_lvt(unsigned ch
+@@ -1011,22 +1014,34 @@ void setup_APIC_extended_lvt(unsigned ch
void smp_local_timer_interrupt(void)
{
@@ -5765,7 +5843,7 @@
}
/*
-@@ -1042,11 +1031,6 @@ void smp_apic_timer_interrupt(struct pt_
+@@ -1042,11 +1057,6 @@ void smp_apic_timer_interrupt(struct pt_
struct pt_regs *old_regs = set_irq_regs(regs);
/*
@@ -5777,7 +5855,7 @@
* NOTE! We'd better ACK the irq immediately,
* because timer handling can be slow.
*/
-@@ -1126,7 +1110,6 @@ asmlinkage void smp_spurious_interrupt(v
+@@ -1126,7 +1136,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();
@@ -5785,7 +5863,7 @@
irq_exit();
}
-@@ -1225,29 +1208,13 @@ static __init int setup_noapictimer(char
+@@ -1225,29 +1234,13 @@ static __init int setup_noapictimer(char
disable_apic_timer = 1;
return 1;
}
@@ -5819,8 +5897,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-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/process.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -38,6 +38,7 @@
#include <linux/notifier.h>
#include <linux/kprobes.h>
@@ -5848,8 +5926,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-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/Makefile 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -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 \
@@ -5870,8 +5948,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-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/i8259.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
}
}
@@ -5934,8 +6012,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-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/smpboot.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
local_irq_disable();
Dprintk("Stack at about %p\n",&cpuid);
@@ -5945,7 +6023,18 @@
/*
* Save our processor parameters
*/
-@@ -348,8 +346,6 @@ void __cpuinit start_secondary(void)
+@@ -337,19 +335,12 @@ void __cpuinit start_secondary(void)
+ */
+ check_tsc_sync_target();
+
+- Dprintk("cpu %d: setting up apic clock\n", smp_processor_id());
+- setup_secondary_APIC_clock();
+-
+- Dprintk("cpu %d: enabling apic timer\n", smp_processor_id());
+-
+ if (nmi_watchdog == NMI_IO_APIC) {
+ disable_8259A_irq(0);
+ enable_NMI_through_LVT0(NULL);
enable_8259A_irq(0);
}
@@ -5954,10 +6043,27 @@
/*
* The sibling maps must be set before turing the online map on for
* this cpu
+@@ -369,6 +360,7 @@ void __cpuinit start_secondary(void)
+
+ /* Setup the per cpu irq handling data structures */
+ __setup_vector_irq(smp_processor_id());
++
+ /*
+ * Allow the master to continue.
+ */
+@@ -378,6 +370,8 @@ void __cpuinit start_secondary(void)
+
+ unlock_ipi_call_lock();
+
++ setup_secondary_APIC_clock();
++
+ cpu_idle();
+ }
+
Index: linux-2.6.23/include/asm-x86_64/hpet.h
===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/hpet.h 2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/hpet.h 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -1,18 +1,2 @@
-#ifndef _ASM_X8664_HPET_H
-#define _ASM_X8664_HPET_H 1
@@ -5979,8 +6085,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-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/apic.h 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -19,7 +19,7 @@
extern int apic_verbosity;
extern int apic_runs_main_timer;
@@ -6012,8 +6118,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-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/proto.h 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
extern void load_gs_index(unsigned gs);
@@ -6041,8 +6147,8 @@
Index: linux-2.6.23/include/linux/jiffies.h
===================================================================
---- 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
+--- 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
@@ -36,8 +36,6 @@
/* LATCH is used in the interval timer and ftape setup. */
#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */
@@ -6068,8 +6174,8 @@
Index: linux-2.6.23/include/asm-i386/hpet.h
===================================================================
---- 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
+--- 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
@@ -64,8 +64,11 @@
/* hpet memory map physical address */
@@ -6092,8 +6198,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-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/vsyscall.h 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -29,9 +29,6 @@ enum vsyscall_num {
#define VGETCPU_RDTSCP 1
#define VGETCPU_LSL 2
@@ -6106,8 +6212,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-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/setup.c 2007-10-10 09:43:08.000000000 +0200
+--- 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
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct
#endif
}
@@ -6158,8 +6264,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-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/kernel/time/tick-common.c 2007-10-10 09:43:09.000000000 +0200
+--- 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
@@ -200,7 +200,7 @@ static int tick_check_new_device(struct
cpu = smp_processor_id();
@@ -6178,10 +6284,18 @@
spin_unlock_irqrestore(&tick_device_lock, flags);
return ret;
+@@ -345,6 +345,7 @@ static int tick_notify(struct notifier_b
+
+ case CLOCK_EVT_NOTIFY_BROADCAST_ON:
+ case CLOCK_EVT_NOTIFY_BROADCAST_OFF:
++ case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:
+ tick_broadcast_on_off(reason, dev);
+ break;
+
Index: linux-2.6.23/arch/i386/kernel/quirks.c
===================================================================
---- 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
+--- 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
@@ -4,6 +4,8 @@
#include <linux/pci.h>
#include <linux/irq.h>
@@ -6474,8 +6588,8 @@
+#endif
Index: linux-2.6.23/include/linux/pci_ids.h
===================================================================
---- 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
+--- 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
@@ -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