[kernel] r13909 - in dists/sid/linux-2.6/debian: . patches/bugfix/ia64 patches/series

[Aurelien Jarno]

Author: aurel32
Date: Sun Jul 12 21:16:11 2009
New Revision: 13909

Log:
* ia64: fix asm/fpu.h includes.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-asm-fpu-h.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/3

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Jul 12 07:22:53 2009	(r13908)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jul 12 21:16:11 2009	(r13909)
@@ -6,6 +6,9 @@
   [ Martin Michlmayr ]
   * [ARM] export __cpu_flush_dcache_page.
 
+  [ Aurelien Jarno ]
+  * ia64: fix asm/fpu.h includes.
+
  -- Bastian Blank <waldi at debian.org>  Wed, 08 Jul 2009 09:51:46 +0200
 
 linux-2.6 (2.6.30-2) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-asm-fpu-h.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-asm-fpu-h.patch	Sun Jul 12 21:16:11 2009	(r13909)
@@ -0,0 +1,29 @@
+From 9457fedcd62feb1305af553dbc0fdd05243adc52 Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien at aurel32.net>
+Date: Sun, 12 Jul 2009 17:52:44 +0200
+Subject: [PATCH] Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"
+
+asm/fpu.h uses the __IA64_UL macro which is declared in asm/types.h, so
+this include is really required. Without it, GNU libc fails to build.
+
+This reverts commit 2678c07b07ac2076675e5d57653bdf02e9af1950.
+---
+ arch/ia64/include/asm/fpu.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
+index 0c26157..b6395ad 100644
+--- a/arch/ia64/include/asm/fpu.h
++++ b/arch/ia64/include/asm/fpu.h
+@@ -6,6 +6,8 @@
+  *	David Mosberger-Tang <davidm at hpl.hp.com>
+  */
+ 
++#include <linux/types.h>
++
+ /* floating point status register: */
+ #define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */
+ #define FPSR_TRAP_DD	(1 << 1)	/* denormal trap disabled */
+-- 
+1.6.1.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/3	Sun Jul 12 07:22:53 2009	(r13908)
+++ dists/sid/linux-2.6/debian/patches/series/3	Sun Jul 12 21:16:11 2009	(r13909)
@@ -1 +1,2 @@
 + bugfix/arm/export-__cpuc_flush_dcache_page.patch
++ bugfix/ia64/fix-asm-fpu-h.patch