Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6cd59f7a
Commit
6cd59f7a
authored
Jul 13, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge /home/torvalds/linux-2.6-arm
parents
c32511e2
73eb7d9e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
12 deletions
+9
-12
arch/arm/kernel/smp.c
arch/arm/kernel/smp.c
+4
-3
arch/arm/mach-integrator/platsmp.c
arch/arm/mach-integrator/platsmp.c
+5
-3
arch/arm/mach-omap1/leds-h2p2-debug.c
arch/arm/mach-omap1/leds-h2p2-debug.c
+0
-1
arch/arm/nwfpe/fpmodule.c
arch/arm/nwfpe/fpmodule.c
+0
-1
arch/arm/plat-omap/ocpi.c
arch/arm/plat-omap/ocpi.c
+0
-1
include/asm-arm/smp.h
include/asm-arm/smp.h
+0
-3
No files found.
arch/arm/kernel/smp.c
View file @
6cd59f7a
...
...
@@ -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_p
resent_mask
;
cpumask_t
cpu_p
ossible_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'
);
...
...
arch/arm/mach-integrator/platsmp.c
View file @
6cd59f7a
...
...
@@ -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
);
}
/*
...
...
arch/arm/mach-omap1/leds-h2p2-debug.c
View file @
6cd59f7a
...
...
@@ -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>
...
...
arch/arm/nwfpe/fpmodule.c
View file @
6cd59f7a
...
...
@@ -24,7 +24,6 @@
#include "fpa11.h"
#include <linux/module.h>
#include <linux/version.h>
#include <linux/config.h>
/* XXX */
...
...
arch/arm/plat-omap/ocpi.c
View file @
6cd59f7a
...
...
@@ -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>
...
...
include/asm-arm/smp.h
View file @
6cd59f7a
...
...
@@ -23,9 +23,6 @@
#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
* (the >big< penalty is running SMP in the first place)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment