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 /*