r2012 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2004-12-21 01:22:52 -0700 (Tue, 21 Dec 2004)
New Revision: 2012

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/119-acpi_early-build.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-7
Log:
Build fix for ACPI (Closes: #286226)

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	2004-12-21 03:24:50 UTC (rev 2011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-12-21 08:22:52 UTC (rev 2012)
@@ -1,18 +1,22 @@
 kernel-source-2.4.27 (2.4.27-7) UNRELEASED; urgency=low
 
-  * Security: Add missing serialization to unix_dgram_recvmsg() which otherwise
+  * 113-unix-serialization.diff:
+    Security: Add missing serialization to unix_dgram_recvmsg() which otherwise
     could lead to elevated previleges (CAN-2004-1068) (dann frazier)
-  * Security: Fix a potential oops using a malformed a.out binary
+  * 114-binfmt_aout-CAN-2004-1074.diff:
+    Security: Fix a potential oops using a malformed a.out binary
     (CAN-2004-1074) (dann frazier)
   * 115_tty_lockup-3.diff: Fix an unterminated comment (dann frazier)
-  * 116-cmsg-validation-checks.patch, 116-cmsg-validation-checks-compat.patch:
+  * 116-cmsg-validation-checks.patch, 118-cmsg-validation-checks-compat.patch:
     Patches from Herbert Xu and David Miller fixing CMSG validation wrt
     signedness - thanks to Andre Tornt for pointing it out (CAN-2004-1016)
     (dann frazier)
   * 117-igmp-source-filter-fixes.patch: IGMP source filter fixes
     (CAN-2004-1137) (dann frazier)
+  * 119-acpi_early-build.diff: Build fix for ACPI 
+    (Closes: #286226) (Simon Horman)
 
- -- dann frazier <dannf@debian.org>  Thu, 16 Dec 2004 00:40:31 -0700
+ -- Simon Horman <horms@debian.org>  Tue, 21 Dec 2004 17:11:10 +0900
 
 kernel-source-2.4.27 (2.4.27-6) unstable; urgency=low
 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/119-acpi_early-build.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/119-acpi_early-build.diff	2004-12-21 03:24:50 UTC (rev 2011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/119-acpi_early-build.diff	2004-12-21 08:22:52 UTC (rev 2012)
@@ -0,0 +1,36 @@
+# origin: len.brown (BitKeeper)
+# cset: 1.1458.1.3 (2.4) key=412c2d7cayRolUr38hIDNJwGwEaE-A
+# inclusion: upstream
+# descrition: [ACPI] build fix
+# revision date: Tue, 21 Dec 2004 17:02:45 +0900
+#
+# S rset: ChangeSet|1.1458.1.2..1.1458.1.3
+# I rset: init/main.c|1.31..1.32
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/25 02:11:08-04:00 len.brown@intel.com 
+#   [ACPI] build fix
+# 
+# init/main.c
+#   2004/08/25 02:11:03-04:00 len.brown@intel.com +2 -2
+#   build fix
+# 
+#
+===== init/main.c 1.31 vs 1.32 =====
+--- 1.31/init/main.c	2004-08-25 11:54:26 +09:00
++++ 1.32/init/main.c	2004-08-25 15:11:03 +09:00
+@@ -101,10 +101,10 @@
+ extern int init_pcmcia_ds(void);
+ 
+ extern void free_initmem(void);
+-#ifdef  CONFIG_ACPI_BOOT
++#ifdef  CONFIG_ACPI_BUS
+ extern void acpi_early_init(void);
+ #else
+-static inline acpi_early_init() { }
++static inline void acpi_early_init(void) { }
+ #endif
+ 
+ #ifdef CONFIG_TC

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7	2004-12-21 03:24:50 UTC (rev 2011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7	2004-12-21 08:22:52 UTC (rev 2012)
@@ -4,3 +4,4 @@
 + 116-cmsg-validation-checks.diff
 + 117-igmp-source-filter-fixes.diff
 + 118-cmsg-validation-checks-compat.diff
++ 119-acpi_early-build.diff