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
Kirill Smelkov
linux
Commits
c1db9d9b
Commit
c1db9d9b
authored
Jun 12, 2010
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'misc-2.6.35' into release
parents
42de5532
934231de
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
drivers/acpi/fan.c
drivers/acpi/fan.c
+2
-1
drivers/acpi/processor_driver.c
drivers/acpi/processor_driver.c
+5
-0
init/main.c
init/main.c
+3
-1
No files found.
drivers/acpi/fan.c
View file @
c1db9d9b
...
@@ -347,7 +347,6 @@ static int __init acpi_fan_init(void)
...
@@ -347,7 +347,6 @@ static int __init acpi_fan_init(void)
{
{
int
result
=
0
;
int
result
=
0
;
#ifdef CONFIG_ACPI_PROCFS
#ifdef CONFIG_ACPI_PROCFS
acpi_fan_dir
=
proc_mkdir
(
ACPI_FAN_CLASS
,
acpi_root_dir
);
acpi_fan_dir
=
proc_mkdir
(
ACPI_FAN_CLASS
,
acpi_root_dir
);
if
(
!
acpi_fan_dir
)
if
(
!
acpi_fan_dir
)
...
@@ -356,7 +355,9 @@ static int __init acpi_fan_init(void)
...
@@ -356,7 +355,9 @@ static int __init acpi_fan_init(void)
result
=
acpi_bus_register_driver
(
&
acpi_fan_driver
);
result
=
acpi_bus_register_driver
(
&
acpi_fan_driver
);
if
(
result
<
0
)
{
if
(
result
<
0
)
{
#ifdef CONFIG_ACPI_PROCFS
remove_proc_entry
(
ACPI_FAN_CLASS
,
acpi_root_dir
);
remove_proc_entry
(
ACPI_FAN_CLASS
,
acpi_root_dir
);
#endif
return
-
ENODEV
;
return
-
ENODEV
;
}
}
...
...
drivers/acpi/processor_driver.c
View file @
c1db9d9b
...
@@ -581,6 +581,11 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
...
@@ -581,6 +581,11 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
return
0
;
return
0
;
}
}
#ifdef CONFIG_SMP
if
(
pr
->
id
>=
setup_max_cpus
&&
pr
->
id
!=
0
)
return
0
;
#endif
BUG_ON
((
pr
->
id
>=
nr_cpu_ids
)
||
(
pr
->
id
<
0
));
BUG_ON
((
pr
->
id
>=
nr_cpu_ids
)
||
(
pr
->
id
<
0
));
/*
/*
...
...
init/main.c
View file @
c1db9d9b
...
@@ -125,7 +125,9 @@ static char *ramdisk_execute_command;
...
@@ -125,7 +125,9 @@ static char *ramdisk_execute_command;
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
/* Setup configured maximum number of CPUs to activate */
/* Setup configured maximum number of CPUs to activate */
unsigned
int
__initdata
setup_max_cpus
=
NR_CPUS
;
unsigned
int
setup_max_cpus
=
NR_CPUS
;
EXPORT_SYMBOL
(
setup_max_cpus
);
/*
/*
* Setup routine for controlling SMP activation
* Setup routine for controlling SMP activation
...
...
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