From f9e052eac72d3af74332ca3e97ad88884d848049 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 23 Feb 2009 22:57:00 +0300 Subject: [PATCH] --- yaml --- r: 136907 b: refs/heads/master c: b3baaa138cd4223bffb6ca64b873d25cfb1d7c70 h: refs/heads/master i: 136905: 429e235d7bf42d1471d7e5da8076ae23eea50d89 136903: ffaf038ccbccfac643c6a33ba99ade247cb4eb1f v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8b1919553452..39f8f502e778 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57e372932cec8eb141cde039aaeaa91b69fceba2 +refs/heads/master: b3baaa138cd4223bffb6ca64b873d25cfb1d7c70 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index fbcf96b295ff..7cf8d798042e 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -188,6 +188,7 @@ return_to_handler: ENTRY(native_usergs_sysret64) swapgs sysretq +ENDPROC(native_usergs_sysret64) #endif /* CONFIG_PARAVIRT */