[Tpctl-users] Re: Compile Error against kernel 2.6.9-rc1

[Ulrich W. <uw...@as...>]

seems there were small changes in arch/i386/kernel/apm.c
i changed a few things and it compiled without problems.
However didn't work for me, R40e seems to be unsupported.

greetings
  Ulrich



--- thinkpad-5.6.org/2.6/drivers/thinkpadpm.c   2004-09-09 11:23:07.000000000 +0200
+++ thinkpad-5.6/2.6/drivers/thinkpadpm.c       2004-09-09 11:44:31.000000000 +0200
@@ -207,8 +207,8 @@
         cpus = apm_save_cpus();

         cpu = get_cpu();
-       save_desc_40 = cpu_gdt_table[cpu][0x40 / 8];
-       cpu_gdt_table[cpu][0x40 / 8] = bad_bios_desc;
+       save_desc_40 = per_cpu(cpu_gdt_table, cpu)[0x40 / 8];
+       per_cpu(cpu_gdt_table, cpu)[0x40 / 8] = bad_bios_desc;

         local_save_flags(flags);
         APM_DO_CLI;
@@ -231,7 +231,7 @@
                 : "memory", "cc");
         APM_DO_RESTORE_SEGS;
         local_irq_restore(flags);
-       cpu_gdt_table[cpu][0x40 / 8] = save_desc_40;
+       per_cpu(cpu_gdt_table, cpu)[0x40 / 8] = save_desc_40;
         put_cpu();
         apm_restore_cpus(cpus);

@@ -265,8 +265,8 @@
         cpus = apm_save_cpus();

         cpu = get_cpu();
-       save_desc_40 = cpu_gdt_table[cpu][0x40 / 8];
-       cpu_gdt_table[cpu][0x40 / 8] = bad_bios_desc;
+       save_desc_40 = per_cpu(cpu_gdt_table, cpu)[0x40 / 8];
+       per_cpu(cpu_gdt_table, cpu)[0x40 / 8] = bad_bios_desc;

         local_save_flags(flags);
         APM_DO_CLI;
@@ -293,7 +293,7 @@
         }
         APM_DO_RESTORE_SEGS;
         local_irq_restore(flags);
-       cpu_gdt_table[smp_processor_id()][0x40 / 8] = save_desc_40;
+       __get_cpu_var(cpu_gdt_table)[0x40 / 8] = save_desc_40;
         put_cpu();
         apm_restore_cpus(cpus);
         return error;