diff options
author | Ben Hutchings <benh@debian.org> | 2009-12-19 16:19:24 +0000 |
---|---|---|
committer | Ben Hutchings <benh@debian.org> | 2009-12-19 16:19:24 +0000 |
commit | b7bad86edf1a37cb5b3adb2b25d9339f419ee82c (patch) | |
tree | a64a36651da4ba8b9a4aa20f4b849be06e305616 | |
parent | 918afa000cc2f13b0598ce371284fe702055b31f (diff) | |
download | kernel_replicant_linux-b7bad86edf1a37cb5b3adb2b25d9339f419ee82c.tar.gz kernel_replicant_linux-b7bad86edf1a37cb5b3adb2b25d9339f419ee82c.tar.bz2 kernel_replicant_linux-b7bad86edf1a37cb5b3adb2b25d9339f419ee82c.zip |
ia64: Include <linux/personality.h> header in <asm/fcntl.h>; fixes FTBFS
svn path=/dists/trunk/linux-2.6/; revision=14802
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch | 29 | ||||
-rw-r--r-- | debian/patches/series/3 | 1 |
3 files changed, 32 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cdf765f9f88a..0de602857fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ linux-2.6 (2.6.32-3) UNRELEASED; urgency=high * 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@cyrius.com> Fri, 18 Dec 2009 15:34:01 +0000 diff --git a/debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch b/debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch new file mode 100644 index 000000000000..c8c616909821 --- /dev/null +++ b/debian/patches/bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch @@ -0,0 +1,29 @@ +From 566d4fd4a07a92fa0023d29d2ad5477bad537288 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings <ben@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@hpl.hp.com>, Hewlett-Packard Co. + */ + ++#include <linux/personality.h> ++ + #define force_o_largefile() \ + (personality(current->personality) != PER_LINUX32) + +-- +1.6.5.7 + diff --git a/debian/patches/series/3 b/debian/patches/series/3 index e1ddff4555b6..2f7e6f07be5e 100644 --- a/debian/patches/series/3 +++ b/debian/patches/series/3 @@ -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 |