diff --git a/[refs] b/[refs] index 803236f73de9..157a7ebde26d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2fd6419174470f5ae6383f5037d0ee21ed9833f +refs/heads/master: 1256276c98dbcfb009ac8e0687df9a1e291fd149 diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S index 980053c4b9cc..37f5304e80f5 100644 --- a/trunk/arch/x86/kernel/head_64.S +++ b/trunk/arch/x86/kernel/head_64.S @@ -49,7 +49,7 @@ L3_START_KERNEL = pud_index(__START_KERNEL_map) startup_64: /* - * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 1, + * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0, * and someone has loaded an identity mapped page table * for us. These identity mapped page tables map all of the * kernel pages and possibly all of memory. @@ -146,7 +146,7 @@ ident_complete: jmp secondary_startup_64 ENTRY(secondary_startup_64) /* - * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 1, + * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0, * and someone has loaded a mapped page table. * * %esi holds a physical pointer to real_mode_data.