git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
drivers
/
base
/
cpu.c
diff --git
a/drivers/base/cpu.c
b/drivers/base/cpu.c
index
4bef76a
..
7fd095e
100644
(file)
--- a/
drivers/base/cpu.c
+++ b/
drivers/base/cpu.c
@@
-5,6
+5,7
@@
#include <linux/sysdev.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sysdev.h>
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/sched.h>
#include <linux/cpu.h>
#include <linux/topology.h>
#include <linux/device.h>
#include <linux/cpu.h>
#include <linux/topology.h>
#include <linux/device.h>
@@
-103,8
+104,8
@@
static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);
/*
* register_cpu - Setup a driverfs device for a CPU.
/*
* register_cpu - Setup a driverfs device for a CPU.
- * @cpu -
Callers can set the cpu->no_control field to 1, to indicate not to
- *
generate a control file in
sysfs for this CPU.
+ * @cpu -
cpu->hotpluggable field set to 1 will generate a control file in
+ * sysfs for this CPU.
* @num - CPU number to use when creating the device.
*
* Initialize and register the CPU device.
* @num - CPU number to use when creating the device.
*
* Initialize and register the CPU device.
@@
-118,7
+119,7
@@
int __devinit register_cpu(struct cpu *cpu, int num)
error = sysdev_register(&cpu->sysdev);
error = sysdev_register(&cpu->sysdev);
- if (!error &&
!cpu->no_control
)
+ if (!error &&
cpu->hotpluggable
)
register_cpu_control(cpu);
if (!error)
cpu_sys_devices[num] = &cpu->sysdev;
register_cpu_control(cpu);
if (!error)
cpu_sys_devices[num] = &cpu->sysdev;