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

[Ben Hutchings]

Author: benh
Date: Sat Dec 19 16:19:24 2009
New Revision: 14802

Log:
ia64: Include <linux/personality.h> header in <asm/fcntl.h>; fixes FTBFS

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/3

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Dec 19 00:46:07 2009	(r14801)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec 19 16:19:24 2009	(r14802)
@@ -14,6 +14,8 @@
   * Add stable release 2.6.32.2:
     - KVM: x86 emulator: limit instructions to 15 bytes (CVE-2009-4031)
     - hfs: fix a potential buffer overflow (CVE-2009-4020)
+  * ia64: Include <linux/personality.h> header in <asm/fcntl.h>; fixes
+    FTBFS
 
  -- Martin Michlmayr <tbm at cyrius.com>  Fri, 18 Dec 2009 15:34:01 +0000
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch	Sat Dec 19 16:19:24 2009	(r14802)
@@ -0,0 +1,29 @@
+From 566d4fd4a07a92fa0023d29d2ad5477bad537288 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 19 Dec 2009 14:51:09 +0000
+Subject: [PATCH] ia64: Include <linux/personality.h> header in <asm/fcntl.h>
+
+The definition of force_o_largefile() references personality, but this
+header does not include <linux/personality.h>.  This happens to work
+for sys_open(), but may not for any other users.  In particular, aufs2
+now uses this macro and so fails to build on ia64.
+---
+ arch/ia64/include/asm/fcntl.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/ia64/include/asm/fcntl.h b/arch/ia64/include/asm/fcntl.h
+index 1dd275d..3cac8f9 100644
+--- a/arch/ia64/include/asm/fcntl.h
++++ b/arch/ia64/include/asm/fcntl.h
+@@ -5,6 +5,8 @@
+  *	David Mosberger-Tang <davidm at hpl.hp.com>, Hewlett-Packard Co.
+  */
+ 
++#include <linux/personality.h>
++
+ #define force_o_largefile()	\
+ 		(personality(current->personality) != PER_LINUX32)
+ 
+-- 
+1.6.5.7
+

Modified: dists/trunk/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/3	Sat Dec 19 00:46:07 2009	(r14801)
+++ dists/trunk/linux-2.6/debian/patches/series/3	Sat Dec 19 16:19:24 2009	(r14802)
@@ -6,3 +6,4 @@
 + features/all/sfc-2.6.33-rc1.patch
 - bugfix/mips/drm-ttm-build-fix.patch
 + bugfix/all/stable/2.6.32.2.patch
++ bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch