[PATCH] 2.3.41 - config options not starting with CONFIG_

[James Manning]

[ Saturday, January 29, 2000 ] James Manning wrote:
> [ Saturday, January 29, 2000 ] Michael Elizabeth Chastain wrote:
> > You are correct: config options have to start with CONFIG_ in order for
> > config dependencies to work.  The bad part is that they will fail silently
> > with no errors (if someone reconfigures and changes one of these symbols,
> > the affected files will not be rebuilt).
> 
> Ouch.  Time to patch them back to CONFIG_* names :)

Here is the patch (attached).  Of the 5 broken options, 3
were only in Configure.help (CONFIG_IDEDMA_NEW_DRIVE_LISTINGS,
CONFIG_PDC202XX_FORCE_MASTER_MODE, CONFIG_PDC202XX_FORCE_BURST_BIT)
and 2 were broken in all places (CONFIG_HPT366_FAST_IRQ_PREDICTION,
CONFIG_HPT366_MODE3).

James
-- 
Miscellaneous Engineer --- IBM Netfinity Performance Development
------------ próxima parte ------------
diff -ruN linux-2.3.41/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.3.41/Documentation/Configure.help	Sat Jan 29 15:18:37 2000
+++ linux/Documentation/Configure.help	Sat Jan 29 16:11:40 2000
@@ -583,7 +583,7 @@
   It is safe to say Y to this question.
 
 Good-Bad DMA Model-Firmware (EXPERIMENTAL)
-IDEDMA_NEW_DRIVE_LISTINGS
+CONFIG_IDEDMA_NEW_DRIVE_LISTINGS
   If you say Y here, the model and firmware revision of your drive
   will be compared against a blacklist of buggy drives that claim to
   be (U)DMA capable but aren't. This is a blanket on/off test with no
@@ -711,12 +711,12 @@
   Please read the comments at the top of drivers/block/hpt366.c
 
 HPT366 Fast Interrupt support (EXPERIMENTAL) (WIP)
-HPT366_FAST_IRQ_PREDICTION
+CONFIG_HPT366_FAST_IRQ_PREDICTION
 
   If unsure, say N.
 
 HPT366 mode three unsupported (EXPERIMENTAL) (WIP)
-HPT366_MODE3
+CONFIG_HPT366_MODE3
   This is an undocumented mode that the HA366 can default to in many cases.
   If unsure, say N.
 
@@ -785,7 +785,7 @@
   If unsure, say N.
 
 Special UDMA Feature
-PDC202XX_FORCE_BURST_BIT
+CONFIG_PDC202XX_FORCE_BURST_BIT
   For PDC20246 and PDC20262 Ultra DMA chipsets. Designed originally
   for PDC20246/Ultra33 that has BIOS setup failures when using 3 or
   more cards.
@@ -795,7 +795,7 @@
   If unsure, say N.
 
 Special Mode Feature (EXPERIMENTAL)
-PDC202XX_FORCE_MASTER_MODE
+CONFIG_PDC202XX_FORCE_MASTER_MODE
   For PDC20246 and PDC20262 Ultra DMA chipsets. This is reserved for
   possible Hardware RAID 0,1 for the FastTrak Series.
 
diff -ruN linux-2.3.41/drivers/block/Config.in linux/drivers/block/Config.in
--- linux-2.3.41/drivers/block/Config.in	Mon Jan 24 14:24:50 2000
+++ linux/drivers/block/Config.in	Sat Jan 29 16:10:10 2000
@@ -79,8 +79,8 @@
 	       fi
 	       bool '    HPT366 chipset support' CONFIG_BLK_DEV_HPT366
 	       if [ "$CONFIG_IDEDMA_PCI_EXPERIMENTAL" = "y" -a "$CONFIG_BLK_DEV_HPT366" = "y" ]; then
-		  bool '      HPT366 Fast Interrupt support (EXPERIMENTAL) (WIP)' HPT366_FAST_IRQ_PREDICTION
-		  bool '      HPT366 mode three unsupported (EXPERIMENTAL) (WIP)' HPT366_MODE3
+		  bool '      HPT366 Fast Interrupt support (EXPERIMENTAL) (WIP)' CONFIG_HPT366_FAST_IRQ_PREDICTION
+		  bool '      HPT366 mode three unsupported (EXPERIMENTAL) (WIP)' CONFIG_HPT366_MODE3
 	       fi
 	       if [ "$CONFIG_X86" = "y" ]; then
 		  bool '    Intel PIIXn chipsets support' CONFIG_BLK_DEV_PIIX
diff -ruN linux-2.3.41/drivers/block/hpt366.c linux/drivers/block/hpt366.c
--- linux-2.3.41/drivers/block/hpt366.c	Mon Jan 24 14:24:50 2000
+++ linux/drivers/block/hpt366.c	Sat Jan 29 16:09:31 2000
@@ -262,20 +262,20 @@
 
 	pci_read_config_byte(HWIF(drive)->pci_dev, 0x51, &reg51h);
 
-#ifdef HPT366_FAST_IRQ_PREDICTION
+#ifdef CONFIG_HPT366_FAST_IRQ_PREDICTION
 	/*
 	 * Some drives prefer/allow for the method of handling interrupts.
 	 */
 	if (!(reg51h & 0x80))
 		pci_write_config_byte(HWIF(drive)->pci_dev, 0x51, reg51h|0x80);
-#else /* ! HPT366_FAST_IRQ_PREDICTION */
+#else /* ! CONFIG_HPT366_FAST_IRQ_PREDICTION */
 	/*
 	 * Disable the "fast interrupt" prediction.
 	 * Instead, always wait for the real interrupt from the drive!
 	 */
 	if (reg51h & 0x80)
 		pci_write_config_byte(HWIF(drive)->pci_dev, 0x51, reg51h & ~0x80);
-#endif /* HPT366_FAST_IRQ_PREDICTION */
+#endif /* CONFIG_HPT366_FAST_IRQ_PREDICTION */
 
 	/*
 	 * Preserve existing PIO settings:
diff -ruN linux-2.3.41/drivers/block/ide-pci.c linux/drivers/block/ide-pci.c
--- linux-2.3.41/drivers/block/ide-pci.c	Mon Jan 24 14:24:50 2000
+++ linux/drivers/block/ide-pci.c	Sat Jan 29 16:10:17 2000
@@ -682,12 +682,12 @@
 	printk("%s: IDE controller on PCI bus %02x dev %02x\n", d2->name, dev2->bus->number, dev2->devfn);
 	if (hpt363_shared_pin && !hpt363_shared_irq) {
 		printk("%s: IDE controller run unsupported mode three!!!\n", d2->name);
-#ifndef HPT366_MODE3
+#ifndef CONFIG_HPT366_MODE3
 		printk("%s: IDE controller report to <andre en suse.com>\n", d->name);
 		return;
-#else /* HPT366_MODE3 */
+#else /* CONFIG_HPT366_MODE3 */
 		printk("%s: OVERRIDE IDE controller not advisable this mode!!!\n", d2->name);
-#endif /* HPT366_MODE3 */
+#endif /* CONFIG_HPT366_MODE3 */
 	}
 	ide_setup_pci_device(dev2, d2);
 }