diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 02:24:11 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 02:24:11 -0500 |
| commit | 33dc5c1000c193084a70ffd8f3bd9c67d19f9159 (patch) | |
| tree | cde79b1bae7fd7b7fd822a5cabc9d421af6b36a5 /arch/sh/kernel/cpu | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
sh: Fix up store queue code for subsys_interface changes.
Fixes up a number of build and section mismatch errors introduced by the
subsys_interface conversion.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c index a8140f0bbf6c..0a47bd3e7bee 100644 --- a/arch/sh/kernel/cpu/sh4/sq.c +++ b/arch/sh/kernel/cpu/sh4/sq.c | |||
| @@ -337,7 +337,7 @@ static struct kobj_type ktype_percpu_entry = { | |||
| 337 | .default_attrs = sq_sysfs_attrs, | 337 | .default_attrs = sq_sysfs_attrs, |
| 338 | }; | 338 | }; |
| 339 | 339 | ||
| 340 | static int __devinit sq_dev_add(struct device *dev) | 340 | static int sq_dev_add(struct device *dev, struct subsys_interface *sif) |
| 341 | { | 341 | { |
| 342 | unsigned int cpu = dev->id; | 342 | unsigned int cpu = dev->id; |
| 343 | struct kobject *kobj; | 343 | struct kobject *kobj; |
| @@ -355,7 +355,7 @@ static int __devinit sq_dev_add(struct device *dev) | |||
| 355 | return error; | 355 | return error; |
| 356 | } | 356 | } |
| 357 | 357 | ||
| 358 | static int __devexit sq_dev_remove(struct device *dev) | 358 | static int sq_dev_remove(struct device *dev, struct subsys_interface *sif) |
| 359 | { | 359 | { |
| 360 | unsigned int cpu = dev->id; | 360 | unsigned int cpu = dev->id; |
| 361 | struct kobject *kobj = sq_kobject[cpu]; | 361 | struct kobject *kobj = sq_kobject[cpu]; |
| @@ -365,10 +365,10 @@ static int __devexit sq_dev_remove(struct device *dev) | |||
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | static struct subsys_interface sq_interface = { | 367 | static struct subsys_interface sq_interface = { |
| 368 | .name = "sq" | 368 | .name = "sq", |
| 369 | .subsys = &cpu_subsys, | 369 | .subsys = &cpu_subsys, |
| 370 | .add_dev = sq_dev_add, | 370 | .add_dev = sq_dev_add, |
| 371 | .remove_dev = __devexit_p(sq_dev_remove), | 371 | .remove_dev = sq_dev_remove, |
| 372 | }; | 372 | }; |
| 373 | 373 | ||
| 374 | static int __init sq_api_init(void) | 374 | static int __init sq_api_init(void) |
