[kernel] r18817 - in dists/squeeze/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Sun Mar 11 23:21:35 2012
New Revision: 18817

Log:
ia64: Define is_compat_task()

autofs now needs is_compat_task(), and we need to define it when
CONFIG_COMPAT is enabled.  Apparently hardware-assisted IA32 emulation
is broken and we should just disable it, but doing that now will break
ABI compatibility.

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/ia64-Define-is_compat_task.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/42

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Mar 11 23:20:20 2012	(r18816)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Mar 11 23:21:35 2012	(r18817)
@@ -46,6 +46,7 @@
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.58
     and the bug report which this closes: #662573.
+  * ia64: Define is_compat_task(), now needed by autofs
 
  -- Uwe Kleine-König <u.kleine-koenig at pengutronix.de>  Mon, 16 Jan 2012 16:47:21 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/debian/ia64-Define-is_compat_task.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/ia64-Define-is_compat_task.patch	Sun Mar 11 23:21:35 2012	(r18817)
@@ -0,0 +1,39 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 11 Mar 2012 22:48:32 +0000
+Subject: [PATCH] ia64: Define is_compat_task()
+
+autofs now needs is_compat_task(), and we need to define it when
+CONFIG_COMPAT is enabled.  Apparently hardware-assisted IA32 emulation
+is broken and we should just disable it, but doing that now will break
+ABI compatibility.
+---
+ arch/ia64/include/asm/compat.h |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h
+index c8662cd..f5bafa6 100644
+--- a/arch/ia64/include/asm/compat.h
++++ b/arch/ia64/include/asm/compat.h
+@@ -4,6 +4,7 @@
+  * Architecture specific compatibility types
+  */
+ #include <linux/types.h>
++#include <asm/system.h>
+ 
+ #define COMPAT_USER_HZ	100
+ 
+@@ -204,4 +205,11 @@ arch_compat_alloc_user_space (long len)
+ 	return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
+ }
+ 
++#ifdef CONFIG_COMPAT
++static inline int is_compat_task(void)
++{
++	return IS_IA32_PROCESS(task_pt_regs(current));
++}
++#endif
++
+ #endif /* _ASM_IA64_COMPAT_H */
+-- 
+1.7.9.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/42
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/42	Sun Mar 11 23:20:20 2012	(r18816)
+++ dists/squeeze/linux-2.6/debian/patches/series/42	Sun Mar 11 23:21:35 2012	(r18817)
@@ -9,3 +9,4 @@
 + bugfix/all/stable/2.6.32.57.patch
 + bugfix/all/appletalk-da.s_net-not-copied-but-assigned-to-itself.patch
 + bugfix/all/stable/2.6.32.58.patch
++ debian/ia64-Define-is_compat_task.patch