Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d5271be6b5601b3749cccd8ee89941d5868b90bf
Commit:     d5271be6b5601b3749cccd8ee89941d5868b90bf
Parent:     282037f17f1db66f555b40eedef1215a5f4b36af
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 26 20:31:15 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Fri Oct 26 20:31:15 2007 +0200

    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 <[EMAIL PROTECTED]>. ]
    
    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 <[EMAIL PROTECTED]>
    Cc: Ralf Baechle <[EMAIL PROTECTED]>
    Cc: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/pci/generic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index f44d708..0688569 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -49,7 +49,7 @@ static int __init ide_generic_all_on(char *unused)
        printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage 
controllers.\n");
        return 1;
 }
-__setup("all-generic-ide", ide_generic_all_on);
+const __setup("all-generic-ide", ide_generic_all_on);
 #endif
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE 
storage controllers.");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to