[kernel] r18950 - dists/squeeze/linux-2.6/debian/patches/debian

[Ben Hutchings]

Author: benh
Date: Wed Apr 25 02:15:56 2012
New Revision: 18950

Log:
Clean up revert of "Work around unhappy compat problem on x86-64"

Leave is_compat_task() where it is, as the various definitions under
arch/*/include were removed by follow-up patches.  In particular, S390
!COMPAT would be broken.

Add an explanatory header to the patch.

Modified:
   dists/squeeze/linux-2.6/debian/patches/debian/revert-autofs-work-around-unhappy-compat-problem-on-x86-64.patch

Modified: dists/squeeze/linux-2.6/debian/patches/debian/revert-autofs-work-around-unhappy-compat-problem-on-x86-64.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/debian/revert-autofs-work-around-unhappy-compat-problem-on-x86-64.patch	Tue Apr 24 23:02:37 2012	(r18949)
+++ dists/squeeze/linux-2.6/debian/patches/debian/revert-autofs-work-around-unhappy-compat-problem-on-x86-64.patch	Wed Apr 25 02:15:56 2012	(r18950)
@@ -1,3 +1,12 @@
+Subject: Revert "autofs: work around unhappy compat problem on x86-64"
+
+This reverts commit 82e43e2a64739caf323ac98641e1250c3808c300
+(commit a32744d4abae24572eff7269bc17895c41bd0085 upstream).
+
+The original bug (#633423) is 6 years old and autofs has a workaround
+for it which is broken by this fix.  systemd doesn't have the
+workaround, but it also isn't in squeeze.
+
 diff -urpN a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
 --- a/fs/autofs4/autofs_i.h	2012-04-24 15:43:30.548405656 -0600
 +++ b/fs/autofs4/autofs_i.h	2012-04-24 16:16:43.437403189 -0600
@@ -78,16 +87,3 @@
  		packet->wait_queue_token = wq->wait_queue_token;
  		packet->len = wq->name.len;
  		memcpy(packet->name, wq->name.name, wq->name.len);
-diff -urpN a/include/linux/compat.h b/include/linux/compat.h
---- a/include/linux/compat.h	2012-04-24 15:43:30.584406041 -0600
-+++ b/include/linux/compat.h	2012-04-24 16:16:43.445403275 -0600
-@@ -311,9 +311,5 @@ asmlinkage long compat_sys_openat(unsign
- 
- extern void __user *compat_alloc_user_space(unsigned long len);
- 
--#else
--
--#define is_compat_task() (0)
--
- #endif /* CONFIG_COMPAT */
- #endif /* _LINUX_COMPAT_H */