rpms/kernel/devel kernel.spec, 1.180, 1.181 linux-2.6-highres-timers.patch, 1.11, 1.12
Dave Jones (davej)
fedora-extras-commits at redhat.com
Mon Sep 24 18:18:02 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25278
Modified Files:
kernel.spec linux-2.6-highres-timers.patch
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- Update hi-res timers patch to .23rc7-hrt1.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kernel.spec 24 Sep 2007 14:37:26 -0000 1.180
+++ kernel.spec 24 Sep 2007 18:17:29 -0000 1.181
@@ -1803,6 +1803,9 @@
%changelog
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- Update hi-res timers patch to .23rc7-hrt1.
+
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7-git5
* Sun Sep 23 2007 Dave Jones <davej at redhat.com>
linux-2.6-highres-timers.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-highres-timers.patch 24 Sep 2007 02:26:20 -0000 1.11
+++ linux-2.6-highres-timers.patch 24 Sep 2007 18:17:29 -0000 1.12
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc3/include/linux/clockchips.h
+Index: linux-2.6.23-rc7/include/linux/clockchips.h
===================================================================
---- linux-2.6.23-rc3.orig/include/linux/clockchips.h 2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/clockchips.h 2007-08-13 16:49:31.000000000 +0200
+--- 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
@@ -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-rc3/kernel/time/Kconfig
+Index: linux-2.6.23-rc7/kernel/time/Kconfig
===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/Kconfig 2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/Kconfig 2007-08-13 16:49:31.000000000 +0200
+--- 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
@@ -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-rc3/kernel/time/Makefile
+Index: linux-2.6.23-rc7/kernel/time/Makefile
===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/Makefile 2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/Makefile 2007-08-13 16:49:31.000000000 +0200
+--- 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
@@ -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-rc3/kernel/time/clockevents.c
+Index: linux-2.6.23-rc7/kernel/time/clockevents.c
===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/clockevents.c 2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/clockevents.c 2007-08-13 16:49:31.000000000 +0200
+--- 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
@@ -194,6 +194,7 @@ void clockevents_exchange_device(struct
local_irq_restore(flags);
}
@@ -71,151 +71,595 @@
EXPORT_SYMBOL_GPL(clockevents_notify);
-
+#endif
-Index: linux-2.6.23-rc3/Documentation/cpuidle/core.txt
+Index: linux-2.6.23-rc7/Documentation/00-INDEX
+===================================================================
+--- 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
+@@ -62,6 +62,8 @@ VGA-softcursor.txt
+ - how to change your VGA cursor from a blinking underscore.
+ accounting/
+ - documentation on accounting and taskstats.
++acpi
++ - general ACPI information
+ aoe/
+ - description of AoE (ATA over Ethernet) along with config examples.
+ applying-patches.txt
+Index: linux-2.6.23-rc7/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
+@@ -0,0 +1,6 @@
++00-INDEX
++ - this file
++README.ACPI
++ - where to start
++acpi_debugging.txt
++ - How to debug ACPI problems
+Index: linux-2.6.23-rc7/Documentation/acpi/README.ACPI
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc3/Documentation/cpuidle/core.txt 2007-08-13 16:49:31.000000000 +0200
-@@ -0,0 +1,17 @@
++++ linux-2.6.23-rc7/Documentation/acpi/README.ACPI 2007-09-20 21:06:24.000000000 +0200
+@@ -0,0 +1,377 @@
++Developing ACPI for Linux - July 13, 2007
++------------------------------------------
++Len Brown <lenb at kernel.org> (Intel Open Source Technology Center)
++
++This is how you can be most effective improving Linux ACPI support.
++
++Latest version of this file
++---------------------------
++http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/README.ACPI
++
++Linux/ACPI home page
++--------------------
++http://acpi.sourceforge.net/
++
++Mailing Lists
++-------------
++Inventory of lists: http://acpi.sourceforge.net/mailinglists.html
++
++The main list is linux-acpi at vger.kernel.org.
++Subscribe here: http://vger.kernel.org/vger-lists.html#linux-acpi
++Note this list server has a 100KB message limit size.
++If you need to post something big, attaching it to a bugzilla entry
++(below) is usually the way to go.
++
++Which e-mail address to use?
++----------------------------
++For issues, discussion, RFC's, debugging etc:
++To: linux-acpi at vger.kernel.org
++
++To request an ACPI patch be applied to Linux:
++To: lenb at kernel.org
++Cc: linux-acpi at vger.kernel.org
++
++Feedback to (only) Intel on Intel's ACPICA,
++or ACPI-related issues with NDA pre-production systems:
++To: acpi at linux.intel.com
++
++Len Brown is on both of these lists, and he also sees traffic to
++LKML, cpufreq, pci, and ia64 lists when the word ACPI appears in it.
++
++Note that Len signs-off using "len.brown at intel.com" to make it clear
++that he is employed by Intel. While that address is functional,
++lenb at kernel.org is preferred for all public Linux work.
++
++asus_acpi or asus-laptop specific e-mail:
++to: acpi4asus-user at lists.sourceforge.net
++
++ibm_acpi specific e-mail:
++ibm-acpi-devel at lists.sourceforge.net
++
++Bugzilla
++--------
++The Linux/ACPI community makes active use of bugzilla.
++http://bugzilla.kernel.org/enter_bug.cgi?product=ACPI
++Note that this database is for kernel.org kernels only.
++
++If an issue is specific to a distribution, it should
++be filed in their database. If a sighting appears in both,
++please cross reference it using a complete URL.
++
++In both cases, please cc: acpi-bugzilla at lists.sourceforge.net
++on the bug report. You can subscribe to this list to see
++all ACPI bugzilla updates:
++https://lists.sourceforge.net/lists/listinfo/acpi-bugzilla
++Note that this list is intended for bugzilla machine-generated
++messages only.
++
++If the distribution bug report is private due to being
++on pre-production hardware and you want Intel's ACPI team
++to know about it, then cc: acpi at linux.intel.com
++
++Sometimes you'll see check-in comments including reference
++to small bugzilla numbers, eg. (BZ 123), these refer to a
++bugzilla database inside Intel where ACPICA issues
++are tracked that don't apply directly to the Linux kernel
++and thus would not fit within the charter of bugzilla.kernel.org.
++
++While discussion-oriented issues are best dealt with
++on the list, bugzilla has two useful properties:
++
++1. you can attach a whole bunch of stuff there
++ without irritating everybody on the list --
++ including items > 100KB.
++2. bugzilla never forgets -- so your issue
++ will not get lost in the shuffle of e-mail overload.
++
++Sometimes it works well to file the supporting debug output
++for your issue in bugzilla and then refer to it
++on the linux-acpi at vger.kernel.org list.
++
++Please be sure to answer these questions when you submit
++the bug, so they don't have to be asked later:
++
++0. Exactly what kernel version does this bug appear in?
++
++1. Does it still appear in the latest version?
++
++2. Is this a new problem (a regression) or has this problem
++ always existed in every version of Linux tested?
++
++3. If a regression, what is the latest version of the
++ kernel.org kernel where it does not happen?
++
[...3822 lines suppressed...]
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-@@ -208,6 +209,8 @@ void cpu_idle (void)
+@@ -209,6 +209,8 @@ void cpu_idle (void)
if (__get_cpu_var(cpu_idle_state))
__get_cpu_var(cpu_idle_state) = 0;
@@ -5364,10 +5790,10 @@
preempt_enable_no_resched();
schedule();
preempt_disable();
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/Makefile
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/Makefile
===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/Makefile 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/Makefile 2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/Makefile 2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/Makefile 2007-09-20 21:06:25.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 \
@@ -5386,10 +5812,10 @@
therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o
bootflag-y += ../../i386/kernel/bootflag.o
cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/i8259.c
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/i8259.c
===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/i8259.c 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/i8259.c 2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/i8259.c 2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/i8259.c 2007-09-20 21:06:25.000000000 +0200
@@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
}
}
@@ -5450,10 +5876,10 @@
if (!acpi_ioapic)
setup_irq(2, &irq2);
}
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/smpboot.c
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/smpboot.c
===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/smpboot.c 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/smpboot.c 2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/smpboot.c 2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/smpboot.c 2007-09-20 21:06:25.000000000 +0200
@@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
local_irq_disable();
Dprintk("Stack at about %p\n",&cpuid);
@@ -5472,10 +5898,10 @@
/*
* The sibling maps must be set before turing the online map on for
* this cpu
-Index: linux-2.6.23-rc3/include/asm-x86_64/hpet.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/hpet.h
===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/hpet.h 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/hpet.h 2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/hpet.h 2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/hpet.h 2007-09-20 21:06:25.000000000 +0200
@@ -1,18 +1,2 @@
-#ifndef _ASM_X8664_HPET_H
-#define _ASM_X8664_HPET_H 1
@@ -5495,10 +5921,10 @@
-extern unsigned long hpet_tick;
-
-#endif
-Index: linux-2.6.23-rc3/include/asm-x86_64/apic.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/apic.h
===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/apic.h 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/apic.h 2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/apic.h 2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/apic.h 2007-09-20 21:06:25.000000000 +0200
@@ -19,7 +19,6 @@
extern int apic_verbosity;
extern int apic_runs_main_timer;
@@ -5527,10 +5953,10 @@
#define ARCH_APICTIMER_STOPS_ON_C3 1
extern unsigned boot_cpu_id;
-Index: linux-2.6.23-rc3/include/asm-x86_64/proto.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/proto.h
===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/proto.h 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/proto.h 2007-08-13 16:49:33.000000000 +0200
+--- 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
@@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
extern void load_gs_index(unsigned gs);
@@ -5556,10 +5982,10 @@
#define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
#define round_down(x,y) ((x) & ~((y)-1))
-Index: linux-2.6.23-rc3/include/linux/jiffies.h
+Index: linux-2.6.23-rc7/include/linux/jiffies.h
===================================================================
---- linux-2.6.23-rc3.orig/include/linux/jiffies.h 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/jiffies.h 2007-08-13 16:49:34.000000000 +0200
+--- 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
@@ -36,8 +36,6 @@
/* LATCH is used in the interval timer and ftape setup. */
#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */
@@ -5583,10 +6009,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-rc3/include/asm-i386/hpet.h
+Index: linux-2.6.23-rc7/include/asm-i386/hpet.h
===================================================================
---- linux-2.6.23-rc3.orig/include/asm-i386/hpet.h 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-i386/hpet.h 2007-08-13 16:49:35.000000000 +0200
+--- 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
@@ -64,8 +64,11 @@
/* hpet memory map physical address */
@@ -5607,10 +6033,10 @@
#endif /* CONFIG_HPET_TIMER */
#endif /* _I386_HPET_H */
-Index: linux-2.6.23-rc3/include/asm-x86_64/vsyscall.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h
===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/vsyscall.h 2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/vsyscall.h 2007-08-13 16:49:34.000000000 +0200
+--- 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
@@ -29,9 +29,6 @@ enum vsyscall_num {
#define VGETCPU_RDTSCP 1
#define VGETCPU_LSL 2
@@ -5621,10 +6047,10 @@
extern int __vgetcpu_mode;
extern volatile unsigned long __jiffies;
-Index: linux-2.6.23-rc3/kernel/time/tick-broadcast.c
+Index: linux-2.6.23-rc7/kernel/time/tick-broadcast.c
===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/tick-broadcast.c 2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/tick-broadcast.c 2007-08-13 16:49:34.000000000 +0200
+--- 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)
@@ -5637,7 +6063,7 @@
return 0;
clockevents_exchange_device(NULL, dev);
-@@ -519,11 +520,9 @@ static void tick_broadcast_clear_oneshot
+@@ -530,11 +531,9 @@ static void tick_broadcast_clear_oneshot
*/
void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
@@ -5652,10 +6078,10 @@
}
/*
-Index: linux-2.6.23-rc3/kernel/time/tick-common.c
+Index: linux-2.6.23-rc7/kernel/time/tick-common.c
===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/tick-common.c 2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/tick-common.c 2007-08-13 16:49:34.000000000 +0200
+--- 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
@@ -200,7 +200,7 @@ static int tick_check_new_device(struct
cpu = smp_processor_id();
@@ -5674,10 +6100,10 @@
spin_unlock_irqrestore(&tick_device_lock, flags);
return ret;
-Index: linux-2.6.23-rc3/arch/i386/kernel/quirks.c
+Index: linux-2.6.23-rc7/arch/i386/kernel/quirks.c
===================================================================
---- linux-2.6.23-rc3.orig/arch/i386/kernel/quirks.c 2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/arch/i386/kernel/quirks.c 2007-08-13 16:49:35.000000000 +0200
+--- 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
@@ -4,6 +4,8 @@
#include <linux/pci.h>
#include <linux/irq.h>
@@ -5968,11 +6394,11 @@
+}
+
+#endif
-Index: linux-2.6.23-rc3/include/linux/pci_ids.h
+Index: linux-2.6.23-rc7/include/linux/pci_ids.h
===================================================================
---- linux-2.6.23-rc3.orig/include/linux/pci_ids.h 2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/pci_ids.h 2007-08-13 16:49:35.000000000 +0200
-@@ -2215,6 +2215,7 @@
+--- 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
+@@ -2221,6 +2221,7 @@
#define PCI_DEVICE_ID_INTEL_82801EB_5 0x24d5
#define PCI_DEVICE_ID_INTEL_82801EB_6 0x24d6
#define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db
More information about the scm-commits
mailing list