| setup.c (41be702a542a0d14bb0b1c16e824fa9ed27616ec) | setup.c (5d2068da8d339e4dff8f9b9a1246e6a79e2949d8) |
|---|---|
| 1/* 2 * Architecture-specific setup. 3 * 4 * Copyright (C) 1998-2001, 2003-2004 Hewlett-Packard Co 5 * David Mosberger-Tang <davidm@hpl.hp.com> 6 * Stephane Eranian <eranian@hpl.hp.com> 7 * Copyright (C) 2000, 2004 Intel Corp 8 * Rohit Seth <rohit.seth@intel.com> --- 548 unchanged lines hidden (view full) --- 557 /* Initialize the ACPI boot-time table parser */ 558 acpi_table_init(); 559 early_acpi_boot_init(); 560# ifdef CONFIG_ACPI_NUMA 561 acpi_numa_init(); 562# ifdef CONFIG_ACPI_HOTPLUG_CPU 563 prefill_possible_map(); 564# endif | 1/* 2 * Architecture-specific setup. 3 * 4 * Copyright (C) 1998-2001, 2003-2004 Hewlett-Packard Co 5 * David Mosberger-Tang <davidm@hpl.hp.com> 6 * Stephane Eranian <eranian@hpl.hp.com> 7 * Copyright (C) 2000, 2004 Intel Corp 8 * Rohit Seth <rohit.seth@intel.com> --- 548 unchanged lines hidden (view full) --- 557 /* Initialize the ACPI boot-time table parser */ 558 acpi_table_init(); 559 early_acpi_boot_init(); 560# ifdef CONFIG_ACPI_NUMA 561 acpi_numa_init(); 562# ifdef CONFIG_ACPI_HOTPLUG_CPU 563 prefill_possible_map(); 564# endif |
| 565 per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? 566 32 : cpus_weight(early_cpu_possible_map)), | 565 per_cpu_scan_finalize((cpumask_weight(&early_cpu_possible_map) == 0 ? 566 32 : cpumask_weight(&early_cpu_possible_map)), |
| 567 additional_cpus > 0 ? additional_cpus : 0); 568# endif 569#endif /* CONFIG_APCI_BOOT */ 570 571#ifdef CONFIG_SMP 572 smp_build_cpu_map(); 573#endif 574 find_memory(); --- 122 unchanged lines hidden (view full) --- 697 "BogoMIPS : %lu.%02lu\n", 698 cpunum, c->vendor, c->family, c->model, 699 c->model_name, c->revision, c->archrev, 700 features, c->ppn, c->number, 701 proc_freq / 1000, proc_freq % 1000, 702 c->itc_freq / 1000000, c->itc_freq % 1000000, 703 lpj*HZ/500000, (lpj*HZ/5000) % 100); 704#ifdef CONFIG_SMP | 567 additional_cpus > 0 ? additional_cpus : 0); 568# endif 569#endif /* CONFIG_APCI_BOOT */ 570 571#ifdef CONFIG_SMP 572 smp_build_cpu_map(); 573#endif 574 find_memory(); --- 122 unchanged lines hidden (view full) --- 697 "BogoMIPS : %lu.%02lu\n", 698 cpunum, c->vendor, c->family, c->model, 699 c->model_name, c->revision, c->archrev, 700 features, c->ppn, c->number, 701 proc_freq / 1000, proc_freq % 1000, 702 c->itc_freq / 1000000, c->itc_freq % 1000000, 703 lpj*HZ/500000, (lpj*HZ/5000) % 100); 704#ifdef CONFIG_SMP |
| 705 seq_printf(m, "siblings : %u\n", cpus_weight(cpu_core_map[cpunum])); | 705 seq_printf(m, "siblings : %u\n", 706 cpumask_weight(&cpu_core_map[cpunum])); |
| 706 if (c->socket_id != -1) 707 seq_printf(m, "physical id: %u\n", c->socket_id); 708 if (c->threads_per_core > 1 || c->cores_per_socket > 1) 709 seq_printf(m, 710 "core id : %u\n" 711 "thread id : %u\n", 712 c->core_id, c->thread_id); 713#endif --- 214 unchanged lines hidden (view full) --- 928 929 cpu_data = per_cpu_init(); 930#ifdef CONFIG_SMP 931 /* 932 * insert boot cpu into sibling and core mapes 933 * (must be done after per_cpu area is setup) 934 */ 935 if (smp_processor_id() == 0) { | 707 if (c->socket_id != -1) 708 seq_printf(m, "physical id: %u\n", c->socket_id); 709 if (c->threads_per_core > 1 || c->cores_per_socket > 1) 710 seq_printf(m, 711 "core id : %u\n" 712 "thread id : %u\n", 713 c->core_id, c->thread_id); 714#endif --- 214 unchanged lines hidden (view full) --- 929 930 cpu_data = per_cpu_init(); 931#ifdef CONFIG_SMP 932 /* 933 * insert boot cpu into sibling and core mapes 934 * (must be done after per_cpu area is setup) 935 */ 936 if (smp_processor_id() == 0) { |
| 936 cpu_set(0, per_cpu(cpu_sibling_map, 0)); 937 cpu_set(0, cpu_core_map[0]); | 937 cpumask_set_cpu(0, &per_cpu(cpu_sibling_map, 0)); 938 cpumask_set_cpu(0, &cpu_core_map[0]); |
| 938 } else { 939 /* 940 * Set ar.k3 so that assembly code in MCA handler can compute 941 * physical addresses of per cpu variables with a simple: 942 * phys = ar.k3 + &per_cpu_var 943 * and the alt-dtlb-miss handler can set per-cpu mapping into 944 * the TLB when needed. head.S already did this for cpu0. 945 */ --- 125 unchanged lines hidden --- | 939 } else { 940 /* 941 * Set ar.k3 so that assembly code in MCA handler can compute 942 * physical addresses of per cpu variables with a simple: 943 * phys = ar.k3 + &per_cpu_var 944 * and the alt-dtlb-miss handler can set per-cpu mapping into 945 * the TLB when needed. head.S already did this for cpu0. 946 */ --- 125 unchanged lines hidden --- |