← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/x86/kernel/setup_percpu.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/kernel/setup_percpu.c
225
225
                per_cpu(x86_bios_cpu_apicid, cpu) =
226
226
                        early_per_cpu_map(x86_bios_cpu_apicid, cpu);
227
227
#endif
 
228
#ifdef CONFIG_X86_32
 
229
                per_cpu(x86_cpu_to_logical_apicid, cpu) =
 
230
                        early_per_cpu_map(x86_cpu_to_logical_apicid, cpu);
 
231
#endif
228
232
#ifdef CONFIG_X86_64
229
233
                per_cpu(irq_stack_ptr, cpu) =
230
234
                        per_cpu(irq_stack_union.irq_stack, cpu) +
231
235
                        IRQ_STACK_SIZE - 64;
 
236
#endif
232
237
#ifdef CONFIG_NUMA
233
238
                per_cpu(x86_cpu_to_node_map, cpu) =
234
239
                        early_per_cpu_map(x86_cpu_to_node_map, cpu);
242
247
                 */
243
248
                set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
244
249
#endif
245
 
#endif
246
250
                /*
247
251
                 * Up to this point, the boot CPU has been using .init.data
248
252
                 * area.  Reload any changed state for the boot CPU.
256
260
        early_per_cpu_ptr(x86_cpu_to_apicid) = NULL;
257
261
        early_per_cpu_ptr(x86_bios_cpu_apicid) = NULL;
258
262
#endif
259
 
#if defined(CONFIG_X86_64) && defined(CONFIG_NUMA)
 
263
#ifdef CONFIG_X86_32
 
264
        early_per_cpu_ptr(x86_cpu_to_logical_apicid) = NULL;
 
265
#endif
 
266
#ifdef CONFIG_NUMA
260
267
        early_per_cpu_ptr(x86_cpu_to_node_map) = NULL;
261
268
#endif
262
269