Bug#296639: kernel-source-2.4.27: Patches for patch
Package: kernel-source-2.4.27
Version: 2.4.27-8
Followup-For: Bug #296639
I have been monitoring kernel.org for any problems caused by the timer
override patch that I submitted earlier and that is included in
2.4.27-8.experimental.1 (and Linus's 2.4.30-pre2).
Unfortunately, a couple of bugs have cropped up. I attach the patches,
which I grabbed from kernel.org. They apply unaltered to
2.4.27-8.experimental.1.
On a brighter note, I have been running for a few weeks now with the
patch and I have had no problems. Also, I mentioned to Horms that I
had experienced hard lock-ups both before and after applying this patch.
It turns out that I had been overclocking my AthlonXP a bit too hard and
now everything is rock solid. Clock gain still occurs but no worse than
before. I believe this to be a known flaw with the Abit NF7-S
motherboard.
-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.4.27.20050219.0
Locale: LANG=en_GB.ISO-8859-15, LC_CTYPE=en_GB.ISO-8859-15 (charmap=ISO-8859-15)
Versions of packages kernel-source-2.4.27 depends on:
ii binutils 2.15-5 The GNU assembler, linker and bina
ii bzip2 1.0.2-5 high-quality block-sorting file co
ii coreutils [fileutils] 5.2.1-2 The GNU core utilities
-- no debconf information
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/10 07:51:36-03:00 willy@w.ods.org
# [PATCH] acpi.h needs <linux/init.h>
#
# the recent acpi merge in 2.4-BK broke compilation of a few external patches
# (eg: iptable_string), because it declares check_acpi_pci() as void __init,
# while linux/init.h is not included.
#
# Here is a trivial patch which solves the problem.
#
# include/asm-i386/acpi.h
# 2005/03/06 11:35:37-03:00 willy@w.ods.org +2 -0
# acpi.h needs <linux/init.h>
#
diff -Nru a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
--- a/include/asm-i386/acpi.h 2005-03-11 14:01:57 -08:00
+++ b/include/asm-i386/acpi.h 2005-03-11 14:01:57 -08:00
@@ -28,6 +28,8 @@
#ifdef __KERNEL__
+#include <linux/init.h>
+
#define COMPILER_DEPENDENT_INT64 long long
#define COMPILER_DEPENDENT_UINT64 unsigned long long
# This is a BitKeeper generated diff -Nru style patch.
#
# arch/i386/kernel/earlyquirk.c
# 2005/03/10 18:29:55-03:00 cw@f00f.org +1 -1
# early boot code references check_acpi_pci()
#
# ChangeSet
# 2005/03/10 17:59:22-03:00 cw@f00f.org
# [PATCH] early boot code references check_acpi_pci()
#
# For x86 (and friends) ACPI_BOOT=y (always) and this code wants to call
# check_acpi_pci().
#
# Signed-off-by: Chris Wedgwood <cw@f00f.org>
#
# ===== arch/i386/kernel/earlyquirk.c 1.1 vs edited =====
#
diff -Nru a/arch/i386/kernel/earlyquirk.c b/arch/i386/kernel/earlyquirk.c
--- a/arch/i386/kernel/earlyquirk.c 2005-03-11 14:01:56 -08:00
+++ b/arch/i386/kernel/earlyquirk.c 2005-03-11 14:01:56 -08:00
@@ -8,7 +8,7 @@
#include <asm/pci-direct.h>
#include <asm/acpi.h>
-#ifdef CONFIG_ACPI
+#ifdef CONFIG_ACPI_BOOT
static int __init check_bridge(int vendor, int device)
{
/* According to Nvidia all timer overrides are bogus. Just ignore
Reply to: