diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 614f81100..2724e42df 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,8 @@ +*) 2003-12-08 (2.0.0-rc3 - 2.0.0-rc4) + + - Juergen Sawinski and Rene Rebe: udated linux24* (2.4.23) + *) 2003-12-07 (2.0.0-rc3 - 2.0.0-rc4) - added usb compatibility support to devfsd diff --git a/package/base/linux24-header/linux24-header.desc b/package/base/linux24-header/linux24-header.desc index f4dcd6edc..96528280c 100644 --- a/package/base/linux24-header/linux24-header.desc +++ b/package/base/linux24-header/linux24-header.desc @@ -38,11 +38,11 @@ [E] group kernel-header -[O] vanilla_ver="2.4.22" -[O] var_append patchfiles " " "i2c-2.8.0-2.4.22-pre9-rxr5.patch.bz2" +[O] vanilla_ver="2.4.23" +[O] var_append patchfiles " " "linux-2.4.23-i2c-2.8.1.patch" [L] GPL [S] Stable -[V] 2.4.22 +[V] 2.4.23 [P] X 01-------9 102.000 diff --git a/package/base/linux24-src/linux24-src.desc b/package/base/linux24-src/linux24-src.desc index 330b435b2..c61b2a3e8 100644 --- a/package/base/linux24-src/linux24-src.desc +++ b/package/base/linux24-src/linux24-src.desc @@ -38,11 +38,11 @@ [E] group kernel-src -[O] vanilla_ver="2.4.22" -[O] var_append patchfiles " " "i2c-2.8.0-2.4.22-pre9-rxr5.patch.bz2" +[O] vanilla_ver="2.4.23" +[O] var_append patchfiles " " "linux-2.4.23-i2c-2.8.1.patch" [L] GPL [S] Stable -[V] 2.4.22 +[V] 2.4.23 [P] X -1---5---9 105.000 diff --git a/package/base/linux24/arch-x86-64-acpi-hotfix.patch b/package/base/linux24/arch-x86-64-acpi-hotfix.patch deleted file mode 100644 index 86596a4a1..000000000 --- a/package/base/linux24/arch-x86-64-acpi-hotfix.patch +++ /dev/null @@ -1,139 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/linux24/arch-x86-64-acpi-hotfix.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -Marcelo unfortunately added an last minute ACPI update that changed -ACPI interfaces and broke x86-64 compilation. I didn't catch it in -time, so 2.4.22 does not compile out of the box for AMD64. - -This patch fixes it. -You'll have to apply it when compiling 2.4.22 for x86-64 - --Andi - ----------- - -Update x86-64 for the ACPI interrupt link changes. - -diff -u linux/arch/x86_64/kernel/io_apic.c-LINK linux/arch/x86_64/kernel/io_apic.c ---- linux/arch/x86_64/kernel/io_apic.c-LINK 2003-08-22 12:29:21.000000000 +0200 -+++ linux/arch/x86_64/kernel/io_apic.c 2003-08-22 12:38:16.000000000 +0200 -@@ -1762,7 +1762,7 @@ - } - - --int io_apic_set_pci_routing (int ioapic, int pin, int irq) -+int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level ,int active_high_low) - { - struct IO_APIC_route_entry entry; - unsigned long flags; -@@ -1785,18 +1785,21 @@ - entry.dest_mode = INT_DELIVERY_MODE; - entry.dest.logical.logical_dest = TARGET_CPUS; - entry.mask = 1; /* Disabled (masked) */ -- entry.trigger = 1; /* Level sensitive */ -- entry.polarity = 1; /* Low active */ -+ entry.trigger = edge_level; -+ entry.polarity = active_high_low; - - add_pin_to_irq(irq, ioapic, pin); - - entry.vector = assign_irq_vector(irq); - - printk(KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> " -- "IRQ %d)\n", ioapic, -- mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq); -+ "IRQ %d) Mode:%i Active:%i\n", ioapic, -+ mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq, edge_level, active_high_low); - -- irq_desc[irq].handler = &ioapic_level_irq_type; -+ if (edge_level) -+ irq_desc[irq].handler = &ioapic_level_irq_type; -+ else -+ irq_desc[irq].handler = &ioapic_edge_irq_type; - - set_intr_gate(entry.vector, interrupt[irq]); - -diff -u linux/arch/x86_64/kernel/mpparse.c-LINK linux/arch/x86_64/kernel/mpparse.c ---- linux/arch/x86_64/kernel/mpparse.c-LINK 2003-08-22 12:29:21.000000000 +0200 -+++ linux/arch/x86_64/kernel/mpparse.c 2003-08-22 12:29:25.000000000 +0200 -@@ -923,7 +923,7 @@ - - ioapic_pin = irq - mp_ioapic_routing[ioapic].irq_start; - -- io_apic_set_pci_routing(ioapic, ioapic_pin, irq); -+ io_apic_set_pci_routing(ioapic, ioapic_pin, irq, 1, 1); - } - - #endif /*CONFIG_ACPI_HT_ONLY*/ -@@ -939,6 +939,8 @@ - int ioapic_pin = 0; - int irq = 0; - int idx, bit = 0; -+ int edge_level = 0; -+ int active_high_low = 0; - - /* - * Parsing through the PCI Interrupt Routing Table (PRT) and program -@@ -949,11 +951,14 @@ - - /* Need to get irq for dynamic entry */ - if (entry->link.handle) { -- irq = acpi_pci_link_get_irq(entry->link.handle, entry->link.index); -+ irq = acpi_pci_link_get_irq(entry->link.handle, entry->link.index, &edge_level, &active_high_low); - if (!irq) - continue; -- } else -+ } else { -+ edge_level = 1; -+ active_high_low = 1; - irq = entry->link.index; -+ } - - irq = entry->link.index; - ioapic = mp_find_ioapic(irq); -@@ -983,7 +988,7 @@ - - mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<irq = irq; - -diff -u linux/include/asm-x86_64/io_apic.h-LINK linux/include/asm-x86_64/io_apic.h ---- linux/include/asm-x86_64/io_apic.h-LINK 2003-08-22 12:29:21.000000000 +0200 -+++ linux/include/asm-x86_64/io_apic.h 2003-08-22 12:29:25.000000000 +0200 -@@ -148,6 +148,6 @@ - extern int io_apic_get_unique_id (int ioapic, int apic_id); - extern int io_apic_get_version (int ioapic); - extern int io_apic_get_redir_entries (int ioapic); --extern int io_apic_set_pci_routing (int ioapic, int pin, int irq); -+extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int); - - #endif -- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ - diff --git a/package/base/linux24/linux24.desc b/package/base/linux24/linux24.desc index 74cf21422..ebbf6d68d 100644 --- a/package/base/linux24/linux24.desc +++ b/package/base/linux24/linux24.desc @@ -38,13 +38,12 @@ [L] GPL [S] Stable -[V] 2.4.22 +[V] 2.4.23 [P] X -1---5---9 109.000 -[O] vanilla_ver="2.4.22" -[O] var_append patchfiles " " "i2c-2.8.0-2.4.22-pre9-rxr5.patch.bz2" +[O] vanilla_ver="2.4.23" +[O] var_append patchfiles " " "linux-2.4.23-i2c-2.8.1.patch" -[D] 1991898119 linux-2.4.22.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ -# http://www.13thfloor.at/VServer/patches-2.4.22-p9c17/11_i2c-2.8.0.patch.bz2 -[D] 2574157890 i2c-2.8.0-2.4.22-pre9-rxr5.patch.bz2 http://www.rocklinux-consulting.de/oss/linux/i2c/ +[D] 1991898119 linux-2.4.23.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ +[D] 2127003197 linux-2.4.23-i2c-2.8.1.patch http://www.ensicaen.ismra.fr/~delvare/devel/i2c/linux-2.4.23/