Commit d5271be6b5601b3749cccd8ee89941d5868b90bf
1 parent
282037f17f
Exists in
master
and in
7 other branches
drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n
It turns out that const and __{dev}initdata cannot be mixed currently
and that generic IDE PCI host driver is also affected by the same issue:
On Thursday 25 October 2007, Ralf Baechle wrote:
> CC drivers/ide/pci/generic.o
> drivers/ide/pci/generic.c:52: error: __setup_str_ide_generic_all_on causes a
> +section type conflict
[ Also reported by Martijn Uffing <mp3project@sarijopen.student.utwente.nl>. ]
This patch workarounds the problem in a bit hackish way but without
removing const from generic_chipsets[] (it adds const to __setup() so
__setup_str_ide_generic_all becomes const).
Now all __{dev}initdata data in generic IDE PCI host driver are read-only
so it builds again (driver's .init.data section gets marked as READONLY).
Cc: Martijn Uffing <mp3project@sarijopen.student.utwente.nl>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
drivers/ide/pci/generic.c
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 | printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n"); |
| 50 | 50 | return 1; |
| 51 | 51 | } |
| 52 | -__setup("all-generic-ide", ide_generic_all_on); | |
| 52 | +const __setup("all-generic-ide", ide_generic_all_on); | |
| 53 | 53 | #endif |
| 54 | 54 | module_param_named(all_generic_ide, ide_generic_all, bool, 0444); |
| 55 | 55 | MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers."); |