diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/cpuidle/sysfs.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/cpuidle/sysfs.c')
| -rw-r--r-- | drivers/cpuidle/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 0310ffaec9df..be7917ec40c9 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
| @@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpuidle = { | |||
| 300 | .release = cpuidle_state_sysfs_release, | 300 | .release = cpuidle_state_sysfs_release, |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
| 303 | static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i) | 303 | static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i) |
| 304 | { | 304 | { |
| 305 | kobject_put(&device->kobjs[i]->kobj); | 305 | kobject_put(&device->kobjs[i]->kobj); |
| 306 | wait_for_completion(&device->kobjs[i]->kobj_unregister); | 306 | wait_for_completion(&device->kobjs[i]->kobj_unregister); |