Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd59f7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge /home/torvalds/linux-2.6-arm

parents c32511e2 73eb7d9e
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
 * The present bitmask indicates that the CPU is physically present.
 * 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;

/*
@@ -235,7 +235,8 @@ void __init smp_prepare_boot_cpu(void)
{
	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);
}

@@ -355,7 +356,7 @@ void show_ipi_list(struct seq_file *p)

	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_putc(p, '\n');
+5 −3
Original line number Diff line number Diff line
@@ -174,11 +174,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
		max_cpus = ncores;

	/*
	 * Initialise the present mask - this tells us which CPUs should
	 * be present.
	 * Initialise the possible/present maps.
	 * 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++) {
		cpu_set(i, cpu_present_mask);
		cpu_set(i, cpu_possible_map);
		cpu_set(i, cpu_present_map);
	}

	/*
+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
#include <linux/version.h>

#include <asm/io.h>
#include <asm/hardware.h>
+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@
#include "fpa11.h"

#include <linux/module.h>
#include <linux/version.h>
#include <linux/config.h>

/* XXX */
+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@

#include <linux/config.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
Loading