From: Linus Torvalds Date: Sun, 23 Nov 2014 21:56:55 +0000 (-0800) Subject: Merge branch 'x86-traps' (trap handling from Andy Lutomirski) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00c89b2f1111b61e924f49fc79b7d9851fce249d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'x86-traps' (trap handling from Andy Lutomirski) Merge x86-64 iret fixes from Andy Lutomirski: "This addresses the following issues: - an unrecoverable double-fault triggerable with modify_ldt. - invalid stack usage in espfix64 failed IRET recovery from IST context. - invalid stack usage in non-espfix64 failed IRET recovery from IST context. It also makes a good but IMO scary change: non-espfix64 failed IRET will now report the correct error. Hopefully nothing depended on the old incorrect behavior, but maybe Wine will get confused in some obscure corner case" * emailed patches from Andy Lutomirski : x86_64, traps: Rework bad_iret x86_64, traps: Stop using IST for #SS x86_64, traps: Fix the espfix64 #DF fixup and rewrite it in C --- 00c89b2f1111b61e924f49fc79b7d9851fce249d