[kernel] r5681 - in dists/sid/linux-2.6/debian: . patches patches/series

[maximilian attems]

Author: maks-guest
Date: Wed Feb  1 10:35:54 2006
New Revision: 5681

Added:
   dists/sid/linux-2.6/debian/patches/s390-klibc-buildfix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4
Log:
add s390 klibc build fix


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Feb  1 10:35:54 2006
@@ -32,6 +32,7 @@
     - Fix timekeeping on sparc64 ultra-IIe machines
     - Someone broke reiserfs v3 mount options and this fixes it
   * Deactivate sparc64-jumping-time.patch, amd64-pppd-fix.patch incl in aboves.
+  * Add s390-klibc-buildfix.patch, regression due to header file changes.
 
   [ Steve Langasek ]
   * [alpha] set __attribute__((always_inline)) on __cmpxchg(), to avoid
@@ -62,9 +63,9 @@
     build is fixed now.
 
   [ Bastian Blank ]
-  * [powerpc] Fix dependencies of image packages. 
+  * [powerpc] Fix dependencies of image packages.
 
- -- Bastian Blank <waldi at debian.org>  Wed,  1 Feb 2006 09:49:27 +0000
+ -- maximilian attems <maks at sternwelten.at>  Wed,  1 Feb 2006 11:34:20 +0100
 
 linux-2.6 (2.6.15-3) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/s390-klibc-buildfix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/s390-klibc-buildfix.patch	Wed Feb  1 10:35:54 2006
@@ -0,0 +1,20 @@
+--- linux-2.6.15/include/asm-s390/setup.h.orig	2006-02-01 11:27:00.000000000 +0100
++++ linux-2.6.15/include/asm-s390/setup.h	2006-02-01 11:31:54.000000000 +0100
+@@ -67,6 +67,8 @@
+ #define SET_CONSOLE_3215	do { console_mode = 2; } while (0)
+ #define SET_CONSOLE_3270	do { console_mode = 3; } while (0)
+ 
++#ifdef __KERNEL__
++
+ struct ipl_list_header {
+ 	u32 length;
+ 	u8  reserved[3];
+@@ -114,6 +116,8 @@
+ 				 IPL_PARMBLOCK_ORIGIN)
+ #define IPL_PARMBLOCK_SIZE	(IPL_PARMBLOCK_START->hdr.length)
+ 
++#endif /* __KERNEL__ */
++
+ #else 
+ 
+ #ifndef __s390x__

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Wed Feb  1 10:35:54 2006
@@ -5,3 +5,4 @@
 + 64bit-vidiocswin-ioctl-fix.patch
 + sparc64-clock-settime.patch
 + 2.6.15.2.patch
++ s390-klibc-buildfix.patch