From 392e53a057a9c501085d1f66cd63813b37f1a279 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 26 Sep 2006 10:52:37 +0200 Subject: [PATCH] --- yaml --- r: 35919 b: refs/heads/master c: 7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef h: refs/heads/master i: 35917: bb29cc0cec65a9bcd97dbe4b4ffe2e85edc56a1f 35915: adf6340a93d17829141e44bdd3a4ee93cb52228c 35911: 8fd1aace1558d4bc7feba3fd04a1f39fee52095a 35903: 15f78d3612810c9694eebab15bbbecfe013bafa9 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/entry.S | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 13e4ae615bec..468e6d34a168 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aecc63615e15de861db7436c50dade495639132c +refs/heads/master: 7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S index 780f9b26169f..4fcc0ad8bbeb 100644 --- a/trunk/arch/x86_64/kernel/entry.S +++ b/trunk/arch/x86_64/kernel/entry.S @@ -773,7 +773,9 @@ paranoid_exit\trace: testl $3,CS(%rsp) jnz paranoid_userspace\trace paranoid_swapgs\trace: + .if \trace TRACE_IRQS_IRETQ 0 + .endif swapgs paranoid_restore\trace: RESTORE_ALL 8