[PATCH 01/11 gnumach] gdt: Fix tangled ifdefs missing PERCPU_DS for x86_64

[Damien Zammit]

---
 i386/i386/gdt.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/i386/i386/gdt.c b/i386/i386/gdt.c
index 4edd3ec5..9409c2fe 100644
--- a/i386/i386/gdt.c
+++ b/i386/i386/gdt.c
@@ -60,6 +60,7 @@ gdt_fill(int cpu, struct real_descriptor *mygdt)
 #ifndef        MACH_PV_DESCRIPTORS
        _fill_gdt_descriptor(mygdt, LINEAR_DS, 0, 0, ACC_PL_K|ACC_DATA_W, 
SZ_64);
 #endif /* MACH_PV_DESCRIPTORS */
+       _fill_gdt_descriptor(mygdt, PERCPU_DS, 0, 0, ACC_PL_K|ACC_DATA_W, 
SZ_64);
 #else
        _fill_gdt_descriptor(mygdt, KERNEL_CS,
                            LINEAR_MIN_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS,
@@ -79,12 +80,7 @@ gdt_fill(int cpu, struct real_descriptor *mygdt)
        _fill_gdt_descriptor(mygdt, PERCPU_DS,
                            thiscpu,
                            thiscpu + sizeof(struct percpu) - 1,
-#ifdef __x86_64__
-                           ACC_PL_K|ACC_DATA_W, SZ_64
-#else
-                           ACC_PL_K|ACC_DATA_W, SZ_32
-#endif
-       );
+                           ACC_PL_K|ACC_DATA_W, SZ_32);
 #endif
 
 #ifdef MACH_PV_DESCRIPTORS
-- 
2.45.2