r2299 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series
Simon Horman
horms@costa.debian.org
Fri, 14 Jan 2005 12:36:53 +0100
Author: horms
Date: 2005-01-14 12:36:52 +0100 (Fri, 14 Jan 2005)
New Revision: 2299
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/132_apic_off.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8
Log:
+ Do not do acpi_early_init() if apic=off is in effect.
+ (closes: #290039, #290013, #289517, #288712, #285521)
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2005-01-14 06:17:20 UTC (rev 2298)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2005-01-14 11:36:52 UTC (rev 2299)
@@ -4,7 +4,7 @@
to ensure that the permissions of the files in this package are
sensible. (closes: Bug#288279) (Simon Horman)
* Turn a make conditional into a runtime conditional to allow debian/rules
- prune to work. closes: #289682 (Joshua Kwan)
+ prune to work. (closes: #289682) (Joshua Kwan)
Patches applied:
@@ -17,7 +17,7 @@
known as the "uselib() bug". (closes: #289202) (Maximilian Attems)
* 123_nfs_verify_eacces.diff
Return -EACCES instead of -ESTALE to fix some NFS data loss bugs, already
- fixed in 2.6 but not in 2.4. closes: #288046 (Joshua Kwan)
+ fixed in 2.6 but not in 2.4. (closes: #288046) (Joshua Kwan)
* 124_random_poolsize_overflow.diff
[SECURITY] Fix integer overflow in random poolsize sysctl. (Simon Horman)
* 125_moxa_bound_checking.diff
@@ -37,8 +37,11 @@
by Coverity. (Maximilian Attems)
* 131_expand_stack_race.diff
[SECURITY] Fix expand_stack race in mm.h; see CAN-2005-0001.
+ * 127_apic_off.diff
+ Do not do acpi_early_init() if apic=off is in effect.
+ (closes: #290039, #290013, #289517, #288712, #285521) (Simon Horman)
- -- Joshua Kwan <joshk@triplehelix.org> Thu, 13 Jan 2005 15:57:54 -0800
+ -- Simon Horman <horms@debian.org> Fri, 14 Jan 2005 19:51:14 +0900
kernel-source-2.4.27 (2.4.27-7) unstable; urgency=low
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/132_apic_off.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/132_apic_off.diff 2005-01-14 06:17:20 UTC (rev 2298)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/132_apic_off.diff 2005-01-14 11:36:52 UTC (rev 2299)
@@ -0,0 +1,61 @@
+# origin: len.brown (BitKeeper)
+# cset: 1.1458.1.9 (2.4) key=41afcab8Wwiw4tJmged5k36s38Ms8A
+# inclusion: upstream
+# descrition: [ACPI] acpi=off must disable acpi_early_init()
+# revision date: Fri, 14 Jan 2005 19:32:18 +0900
+#
+# S rset: ChangeSet|1.1458.1.8..1.1458.1.9
+# I rset: drivers/acpi/bus.c|1.31..1.32
+#
+# Key:
+# S: Skipped ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted Manually deleted by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/02 21:08:56-05:00 len.brown@intel.com
+# [ACPI] acpi=off must disable acpi_early_init()
+#
+# Signed-off-by: Philippe Troin <phil@fifi.org>
+# Signed-off-by: Len Brown <len.brown@intel.com>
+#
+# drivers/acpi/bus.c
+# 2004/12/02 21:08:54-05:00 len.brown@intel.com +6 -3
+# acpi_early_init() should not run if acpi=off
+#
+#
+===== drivers/acpi/bus.c 1.31 vs 1.32 =====
+--- 1.31/drivers/acpi/bus.c 2004-08-25 11:54:26 +09:00
++++ 1.32/drivers/acpi/bus.c 2004-12-03 11:08:54 +09:00
+@@ -1850,7 +1850,10 @@
+ acpi_status status = AE_OK;
+ struct acpi_buffer buffer = {sizeof(acpi_fadt), &acpi_fadt};
+
+- ACPI_FUNCTION_TRACE("acpi_bus_init");
++ ACPI_FUNCTION_TRACE("acpi_early_init");
++
++ if (acpi_disabled)
++ return_VOID;
+
+ status = acpi_initialize_subsystem();
+ if (ACPI_FAILURE(status)) {
+@@ -1899,11 +1902,11 @@
+ goto error0;
+ }
+
+- return;
++ return_VOID;
+
+ error0:
+ disable_acpi();
+- return;
++ return_VOID;
+ }
+
+ static int __init
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8 2005-01-14 06:17:20 UTC (rev 2298)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8 2005-01-14 11:36:52 UTC (rev 2299)
@@ -10,3 +10,4 @@
+ 129_net_sdla_coverty.diff
+ 130_fs_xfs_coverty.diff
+ 131_expand_stack_race.diff
++ 132_apic_off.diff