arch/x86/kernel/topology.c

   1 /*
   2  * Populate sysfs with topology information
   3  *
   4  * Written by: Matthew Dobson, IBM Corporation
   5  * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
   6  *
   7  * Copyright (C) 2002, IBM Corp.
   8  *
   9  * All rights reserved.
  10  *
  11  * This program is free software; you can redistribute it and/or modify
  12  * it under the terms of the GNU General Public License as published by
  13  * the Free Software Foundation; either version 2 of the License, or
  14  * (at your option) any later version.
  15  *
  16  * This program is distributed in the hope that it will be useful, but
  17  * WITHOUT ANY WARRANTY; without even the implied warranty of
  18  * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
  19  * NON INFRINGEMENT.  See the GNU General Public License for more
  20  * details.
  21  *
  22  * You should have received a copy of the GNU General Public License
  23  * along with this program; if not, write to the Free Software
  24  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  25  *
  26  * Send feedback to <colpatch@us.ibm.com>
  27  */
  28 #include <linux/init.h>
  29 #include <linux/smp.h>
  30 #include <linux/nodemask.h>
  31 #include <linux/mmzone.h>
  32 #include <asm/cpu.h>
  33
  34 static DEFINE_PER_CPU(struct x86_cpu, cpu_devices);
  35
  36 #ifdef CONFIG_HOTPLUG_CPU
  37 <<<<<<< HEAD:arch/x86/kernel/topology.c
  38 int arch_register_cpu(int num)
  39 =======
  40 int __ref arch_register_cpu(int num)
  41 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/x86/kernel/topology.c
  42 {
  43         /*
  44          * CPU0 cannot be offlined due to several
  45          * restrictions and assumptions in kernel. This basically
  46          * doesnt add a control file, one cannot attempt to offline
  47          * BSP.
  48          *
  49          * Also certain PCI quirks require not to enable hotplug control
  50          * for all CPU's.
  51          */
  52         if (num)
  53                 per_cpu(cpu_devices, num).cpu.hotpluggable = 1;
  54         return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
  55 }
  56 EXPORT_SYMBOL(arch_register_cpu);
  57
  58 void arch_unregister_cpu(int num)
  59 {
  60         unregister_cpu(&per_cpu(cpu_devices, num).cpu);
  61 }
  62 EXPORT_SYMBOL(arch_unregister_cpu);
  63 #else
  64 static int __init arch_register_cpu(int num)
  65 {
  66         return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
  67 }
  68 #endif /*CONFIG_HOTPLUG_CPU*/
  69
  70 static int __init topology_init(void)
  71 {
  72         int i;
  73
  74 #ifdef CONFIG_NUMA
  75         for_each_online_node(i)
  76                 register_one_node(i);
  77 #endif /* CONFIG_NUMA */
  78
  79         for_each_present_cpu(i)
  80                 arch_register_cpu(i);
  81         return 0;
  82 }
  83
  84 subsys_initcall(topology_init);