Bug#395135: Please requeue gclcvs_2.7.0-62 on alpha

[Steve Langasek <vorlon@debian.org>]

Package: linux-kernel-headers
Version: 2.6.18-3
Severity: serious
Tags: patch

On Tue, Oct 24, 2006 at 09:31:42AM -0400, Camm Maguire wrote:
> Greetings, and thanks so much!

> Alas, no we have a problem in system.h:

> gcc -I../h -I../gcl-tk -o ../bin/dpp ../bin/dpp.c
> In file included from ../h/config.h:11,
>                  from ../bin/dpp.c:67:
> /usr/include/asm/system.h:574: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'unsigned'

> Advice?

Reverting linux-kernel-headers to 2.6.17? :P

Otherwise, here is a proposed patch that fixes this latest detected
regression in l-k-h 2.6.18.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
vorlon@debian.org                                   http://www.debian.org/

diff -u linux-kernel-headers-2.6.18/debian/changelog linux-kernel-headers-2.6.18/debian/changelog
--- linux-kernel-headers-2.6.18/debian/changelog
+++ linux-kernel-headers-2.6.18/debian/changelog
@@ -1,3 +1,12 @@
+linux-kernel-headers (2.6.18-5.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Don't hide the __always_inline define inside #ifdef __KERNEL__, because
+    the uses of it sure aren't hidden there!
+
+ -- Steve Langasek <vorlon@debian.org>  Tue, 24 Oct 2006 20:05:16 -0700
+
 linux-kernel-headers (2.6.18-5) unstable; urgency=low
 
   * Add m68k-asm-unistd.patch and m68k-asm-user.patch from
only in patch2:
unchanged:
--- linux-kernel-headers-2.6.18.orig/include/asm-alpha/compiler.h
+++ linux-kernel-headers-2.6.18/include/asm-alpha/compiler.h
@@ -99,9 +99,12 @@
 #undef inline
 #undef __inline__
 #undef __inline
+#endif /* __KERNEL__ */
+
+#ifdef __always_inline
 #undef __always_inline
+#endif
 #define __always_inline		inline __attribute__((always_inline))
 
-#endif /* __KERNEL__ */
 
 #endif /* __ALPHA_COMPILER_H */