rpms/kernel/devel linux-2.6.14-powerpc-i8259.patch, NONE, 1.1 patch-2.6.14-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.265, 1.266 kernel-2.6.spec, 1.1644, 1.1645 linux-2.6-dump_smp_call_function.patch, 1.4, 1.5 linux-2.6.14-ppc-initrd.patch, 1.1, 1.2 sources, 1.207, 1.208 upstream, 1.192, 1.193 linux-2.6.14-powerpc-build.patch, 1.2, NONE linux-2.6.14-ppc-nvram.patch, 1.1, NONE patch-2.6.14-git7.bz2.sign, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Nov 5 17:36:43 UTC 2005
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2104
Modified Files:
.cvsignore kernel-2.6.spec
linux-2.6-dump_smp_call_function.patch
linux-2.6.14-ppc-initrd.patch sources upstream
Added Files:
linux-2.6.14-powerpc-i8259.patch patch-2.6.14-git8.bz2.sign
Removed Files:
linux-2.6.14-powerpc-build.patch linux-2.6.14-ppc-nvram.patch
patch-2.6.14-git7.bz2.sign
Log Message:
git8, fix Pegasos
linux-2.6.14-powerpc-i8259.patch:
i8259.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE linux-2.6.14-powerpc-i8259.patch ---
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 90bce6e..b7ac32f 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -207,6 +207,9 @@ void __init i8259_init(unsigned long int
spin_unlock_irqrestore(&i8259_lock, flags);
+ for (i = 0; i < NUM_ISA_INTERRUPTS; ++i)
+ irq_desc[offset + i].handler = &i8259_pic;
+
/* reserve our resources */
setup_irq(offset + 2, &i8259_irqaction);
request_resource(&ioport_resource, &pic1_iores);
@@ -216,6 +219,4 @@ void __init i8259_init(unsigned long int
if (intack_addr != 0)
pci_intack = ioremap(intack_addr, 1);
- for (i = 0; i < NUM_ISA_INTERRUPTS; ++i)
- irq_desc[offset + i].handler = &i8259_pic;
}
--- NEW FILE patch-2.6.14-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBDbGjvyGugalF9Dw4RAiBNAKCC9Uc949nBVcUtHkadYGh5cVsfYgCfWuFd
Cr/CdXwkJ+jGwoGXGEKC1m8=
=vRtl
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- .cvsignore 4 Nov 2005 18:50:09 -0000 1.265
+++ .cvsignore 5 Nov 2005 17:36:39 -0000 1.266
@@ -2,4 +2,4 @@
temp-*
kernel-2.6.14
linux-2.6.14.tar.bz2
-patch-2.6.14-git7.bz2
+patch-2.6.14-git8.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1644
retrieving revision 1.1645
diff -u -r1.1644 -r1.1645
--- kernel-2.6.spec 4 Nov 2005 18:50:09 -0000 1.1644
+++ kernel-2.6.spec 5 Nov 2005 17:36:39 -0000 1.1645
@@ -201,7 +201,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.14-git7.bz2
+Patch1: patch-2.6.14-git8.bz2
# Patches 100 through 500 are meant for architecture patches
Patch100: linux-2.6-bzimage.patch
@@ -217,9 +217,8 @@
Patch300: linux-2.6-ppc64-build.patch
Patch301: linux-2.6-ppc64-eeh-panic.patch
Patch302: linux-2.6-serial-of.patch
-Patch303: linux-2.6.14-powerpc-build.patch
-Patch304: linux-2.6.14-ppc-nvram.patch
-Patch305: linux-2.6.14-ppc-initrd.patch
+Patch303: linux-2.6.14-ppc-initrd.patch
+Patch304: linux-2.6.14-powerpc-i8259.patch
# 400 - 499 ia64
# 500 - 599 s390(x)
@@ -597,7 +596,6 @@
%patch302 -p1
%patch303 -p1
%patch304 -p1
-%patch305 -p1
#
# Xen
@@ -1288,6 +1286,10 @@
%endif
%changelog
+* Sat Nov 05 2005 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.14-git8
+- Fix i8259 cascade initialisation in arch/powerpc
+
* Fri Nov 04 2005 Dave Jones <davej at redhat.com>
- Own /lib/modules/<version>/{extra,updates} (#172075)
- 2.6.14-git7
linux-2.6-dump_smp_call_function.patch:
arch/i386/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
arch/ia64/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
arch/powerpc/kernel/smp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
arch/x86_64/kernel/smp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
drivers/block/diskdump.c | 2 +-
drivers/net/netdump.c | 2 +-
include/linux/smp.h | 2 ++
7 files changed, 181 insertions(+), 3 deletions(-)
Index: linux-2.6-dump_smp_call_function.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-dump_smp_call_function.patch 27 Aug 2005 00:05:52 -0000 1.4
+++ linux-2.6-dump_smp_call_function.patch 5 Nov 2005 17:36:40 -0000 1.5
@@ -65,8 +65,8 @@
* this function sends a 'generic call function' IPI to all other CPUs
* in the system.
*/
---- linux-2.6.12/arch/ppc64/kernel/smp.c.orig 2005-08-23 10:49:53.005279633 -0400
-+++ linux-2.6.12/arch/ppc64/kernel/smp.c 2005-08-23 10:51:04.770473481 -0400
+--- linux-2.6.12/arch/powerpc/kernel/smp.c.orig 2005-08-23 10:49:53.005279633 -0400
++++ linux-2.6.12/arch/powerpc/kernel/smp.c 2005-08-23 10:51:04.770473481 -0400
@@ -200,6 +200,7 @@ void smp_send_stop(void)
* Stolen from the i386 version.
*/
@@ -82,8 +82,8 @@
-} *call_data;
+} *call_data, *saved_call_data;
- /* delay of at least 8 seconds on 1GHz cpu */
- #define SMP_CALL_TIMEOUT (1UL << (30 + 3))
+ /* delay of at least 8 seconds */
+ #define SMP_CALL_TIMEOUT 8
/*
+ * dump version of smp_call_function to avoid deadlock in call_lock
linux-2.6.14-ppc-initrd.patch:
setup-common.c | 40 ++++++++++++++++++++++++++++++++++++++++
setup_32.c | 1 +
setup_64.c | 37 -------------------------------------
3 files changed, 41 insertions(+), 37 deletions(-)
Index: linux-2.6.14-ppc-initrd.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.14-ppc-initrd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.14-ppc-initrd.patch 2 Nov 2005 22:24:54 -0000 1.1
+++ linux-2.6.14-ppc-initrd.patch 5 Nov 2005 17:36:40 -0000 1.2
@@ -46,10 +46,10 @@
* Do some initial setup of the system. The parameters are those which
--- linux-2.6.14/arch/powerpc/kernel/setup-common.c~ 2005-11-02 16:58:56.000000000 +0000
+++ linux-2.6.14/arch/powerpc/kernel/setup-common.c 2005-11-02 22:15:23.000000000 +0000
-@@ -410,3 +410,43 @@ static int __init set_preferred_console(
+@@ -521,3 +521,43 @@ static int __init set_preferred_console(
+ #endif /* CONFIG_PPC64 */
}
- console_initcall(set_preferred_console);
- #endif /* CONFIG_PPC_MULTIPLATFORM */
+ #endif /* CONFIG_SMP */
+
+void __init check_for_initrd(void)
+{
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- sources 4 Nov 2005 18:50:09 -0000 1.207
+++ sources 5 Nov 2005 17:36:40 -0000 1.208
@@ -1,2 +1,2 @@
66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2
-a65f2ae4fcad07e6239adbe49c59bc47 patch-2.6.14-git7.bz2
+82422458f0f9df05e82a8dbf0ce828fa patch-2.6.14-git8.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- upstream 4 Nov 2005 18:50:09 -0000 1.192
+++ upstream 5 Nov 2005 17:36:40 -0000 1.193
@@ -1,2 +1,2 @@
linux-2.6.14.tar.bz2
-patch-2.6.14-git7.bz2
+patch-2.6.14-git8.bz2
--- linux-2.6.14-powerpc-build.patch DELETED ---
--- linux-2.6.14-ppc-nvram.patch DELETED ---
--- patch-2.6.14-git7.bz2.sign DELETED ---
More information about the fedora-cvs-commits
mailing list