restore alpha-prctl patch on trunk, copied from dists/sid

svn path=/dists/trunk/linux-2.6/; revision=7564
This commit is contained in:
Steve Langasek 2006-09-30 09:37:46 +00:00
commit d4ba21cab4
3 changed files with 40 additions and 2 deletions

9
debian/changelog vendored
View File

@ -1,8 +1,13 @@
linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
* Fix home of patch apply script.
[ Bastian Blank ]
* Fix home of patch apply script.
-- Bastian Blank <waldi@debian.org> Fri, 29 Sep 2006 17:10:44 +0200
[ Steve Langasek ]
* [alpha] restore alpha-prctl.patch, which keeps disappearing every time
there's a kernel upgrade :/
-- Steve Langasek <vorlon@debian.org> Sat, 30 Sep 2006 02:28:29 -0700
linux-2.6 (2.6.18-2) unstable; urgency=low

32
debian/patches/alpha-prctl.patch vendored Normal file
View File

@ -0,0 +1,32 @@
diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h
index 69ffd93..011daaf 100644
--- a/include/asm-alpha/thread_info.h
+++ b/include/asm-alpha/thread_info.h
@@ -92,5 +92,27 @@ register struct thread_info *__current_t
#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK \
| _TIF_SYSCALL_TRACE)
+#define ALPHA_UAC_SHIFT 6
+#define ALPHA_UAC_MASK (1 << TIF_UAC_NOPRINT | 1 << TIF_UAC_NOFIX | \
+ 1 << TIF_UAC_SIGBUS)
+
+#define SET_UNALIGN_CTL(task,value) ({ \
+ (task)->thread_info->flags = (((task)->thread_info->flags & \
+ ~ALPHA_UAC_MASK) \
+ | (((value) << ALPHA_UAC_SHIFT) & (1 << TIF_UAC_NOPRINT)) \
+ | (((value) << ALPHA_UAC_SHIFT + 1) & (1 << TIF_UAC_SIGBUS)) \
+ | (((value) << ALPHA_UAC_SHIFT - 1) & (1 << TIF_UAC_NOFIX)));\
+ 0; })
+
+#define GET_UNALIGN_CTL(task,value) ({ \
+ put_user(((task)->thread_info->flags & (1 << TIF_UAC_NOPRINT)) \
+ >> ALPHA_UAC_SHIFT \
+ | ((task)->thread_info->flags & (1 << TIF_UAC_SIGBUS)) \
+ >> ALPHA_UAC_SHIFT + 1 \
+ | ((task)->thread_info->flags & (1 << TIF_UAC_NOFIX)) \
+ >> ALPHA_UAC_SHIFT - 1, \
+ (int __user *)(value)); \
+ })
+
#endif /* __KERNEL__ */
#endif /* _ALPHA_THREAD_INFO_H */

1
debian/patches/series/3 vendored Normal file
View File

@ -0,0 +1 @@
+ alpha-prctl.patch