2.6.27-ncc/0007-NCC-x86-kernel-cpu-common.c-Do-not-init-struct-gdt.patch

   1 From 762cf8bc2e07f515e66fee94cf22c3978f41890b Mon Sep 17 00:00:00 2001
   2 From: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
   3 Date: Fri, 10 Oct 2008 11:29:03 -0300
   4 Subject: [PATCH] NCC: x86/kernel/cpu/common.c: Do not init struct gdt_page
   5
   6 Otherwise ncc will fail with the following error:
   7
   8 """
   9 ncc-error :  open
  10 /home/lcapitulino/src/kernels/upstream/linux-2.6-ncc/arch/x86/kernel/cpu/common.c (29): syntax error:") ; __typeof__ ( struct gdt_page ) per_cpu__gdt_page = { . gdt = { [ ( 12 + 0 ) ] = { { { 65535 , 13605376 } } } , [ ( 12 + 1 ) ] = { { { 65535 , 13603328 } } } , "
  11 make[2]: *** [arch/x86/kernel/cpu/common.o] Error 1
  12 make[1]: *** [arch/x86/kernel/cpu] Error 2
  13 make: *** [arch/x86/kernel] Error 2
  14 """
  15
  16 Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
  17 ---
  18  arch/x86/kernel/cpu/common.c |    5 +++++
  19  1 files changed, 5 insertions(+), 0 deletions(-)
  20
  21 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
  22 index 4e456bd..0d4dc4c 100644
  23 --- a/arch/x86/kernel/cpu/common.c
  24 +++ b/arch/x86/kernel/cpu/common.c
  25 @@ -22,6 +22,9 @@
  26
  27  #include "cpu.h"
  28
  29 +#ifdef __NCC__
  30 +DEFINE_PER_CPU(struct gdt_page, gdt_page);
  31 +#else
  32  DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {
  33         [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } },
  34         [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } },
  35 @@ -56,6 +59,8 @@ DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {
  36         [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } },
  37         [GDT_ENTRY_PERCPU] = { { { 0x00000000, 0x00000000 } } },
  38  } };
  39 +#endif
  40 +
  41  EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
  42
  43  __u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata;
  44 --
  45 1.5.6
  46