x86-64: Fix unwind annotations in recent NMI changes
authorJan Beulich <JBeulich@suse.com>
Thu, 24 Jan 2013 09:27:31 +0000 (09:27 +0000)
committerIngo Molnar <mingo@kernel.org>
Thu, 24 Jan 2013 09:56:32 +0000 (10:56 +0100)
commit444723dccc3c855fe88ea138cdec46f30e707b74
treef640bda062afc286abe52deff72bc187d23f459d
parent021ef050fc092d5638e69868d126c18006ea7296
x86-64: Fix unwind annotations in recent NMI changes

While in one case a plain annotation is necessary, in the other
case the stack adjustment can simply be folded into the
immediately preceding RESTORE_ALL, thus getting the correct
annotation for free.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alexander van Heukelum <heukelum@mailshack.com>
Link: http://lkml.kernel.org/r/51010C9302000078000B9045@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/entry_64.S