From 1fae6bb87260d8afcced9c08aef83e83ced3b5da Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Wed, 26 Nov 2008 22:17:00 +0300 Subject: [PATCH] --- yaml --- r: 121021 b: refs/heads/master c: c2c631e318091118587f3b766347d259c9265b8b h: refs/heads/master i: 121019: 1284f4d2c79140eac06308f00babcccb8fc70201 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1332a6d007c1..35ddc5afecf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33454539f386a2beb38269bea5fff82b3d56b0e9 +refs/heads/master: c2c631e318091118587f3b766347d259c9265b8b diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index 1c309d546518..0a910a7f85f5 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -1160,7 +1160,7 @@ ENTRY(kernel_thread) CFI_ENDPROC END(kernel_thread) -child_rip: +ENTRY(child_rip) pushq $0 # fake return address CFI_STARTPROC /*