Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 17:28:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge /home/torvalds/linux-2.6-arm

Browse Source
This commit is contained in:
Linus Torvalds 2005-07-13 10:12:50 -07:00
commit 6cd59f7a41
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/kernel/smp.c
View File

@ -36,7 +36,7 @@
* The present bitmask indicates that the CPU is physically present. * The present bitmask indicates that the CPU is physically present.
* The online bitmask indicates that the CPU is up and running. * The online bitmask indicates that the CPU is up and running.
*/ */
cpumask_t cpu_present_mask; cpumask_t cpu_possible_map;
cpumask_t cpu_online_map; cpumask_t cpu_online_map;
/* /*
@ -235,7 +235,8 @@ void __init smp_prepare_boot_cpu(void)
{ {
unsigned int cpu = smp_processor_id(); unsigned int cpu = smp_processor_id();
cpu_set(cpu, cpu_present_mask); cpu_set(cpu, cpu_possible_map);
cpu_set(cpu, cpu_present_map);
cpu_set(cpu, cpu_online_map); cpu_set(cpu, cpu_online_map);
} }
@ -355,7 +356,7 @@ void show_ipi_list(struct seq_file *p)
seq_puts(p, "IPI:"); seq_puts(p, "IPI:");
for_each_online_cpu(cpu) for_each_present_cpu(cpu)
seq_printf(p, " %10lu", per_cpu(ipi_data, cpu).ipi_count); seq_printf(p, " %10lu", per_cpu(ipi_data, cpu).ipi_count);
seq_putc(p, '\n'); seq_putc(p, '\n');

8
arch/arm/mach-integrator/platsmp.c
View File

@ -174,11 +174,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
max_cpus = ncores; max_cpus = ncores;
/* /*
* Initialise the present mask - this tells us which CPUs should * Initialise the possible/present maps.
* be present. * cpu_possible_map describes the set of CPUs which may be present
* cpu_present_map describes the set of CPUs populated
*/ */
for (i = 0; i < max_cpus; i++) { for (i = 0; i < max_cpus; i++) {
cpu_set(i, cpu_present_mask); cpu_set(i, cpu_possible_map);
cpu_set(i, cpu_present_map);
} }
/* /*

1
arch/arm/mach-omap1/leds-h2p2-debug.c
View File

@ -13,7 +13,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/version.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/hardware.h> #include <asm/hardware.h>

1
arch/arm/nwfpe/fpmodule.c
View File

@ -24,7 +24,6 @@
#include "fpa11.h" #include "fpa11.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h>
#include <linux/config.h> #include <linux/config.h>
/* XXX */ /* XXX */

1
arch/arm/plat-omap/ocpi.c
View File

@ -25,7 +25,6 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kernel.h> #include <linux/kernel.h>

3
include/asm-arm/smp.h
View File

@ -23,9 +23,6 @@
#define raw_smp_processor_id() (current_thread_info()->cpu) #define raw_smp_processor_id() (current_thread_info()->cpu)
extern cpumask_t cpu_present_mask;
#define cpu_possible_map cpu_present_mask
/* /*
* at the moment, there's not a big penalty for changing CPUs * at the moment, there's not a big penalty for changing CPUs
* (the >big< penalty is running SMP in the first place) * (the >big< penalty is running SMP in the first place)