The patch titled
Make number of IDE interfaces configurable
has been added to the -mm tree. Its filename is
make-number-of-ide-interfaces-configurable.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Matt Mackall <mpm@xxxxxxxxxxx>
Make IDE_HWIFS configurable if EMBEDDED
This lets us lop as much as 16k off an x86 build. It's a little ugly, but
it's dead simple. Note the fix for HWIFS < 2.
Sizing interfaces dynamically unfortunately turns out to be pretty
major surgery.
add/remove: 0/1 grow/shrink: 0/11 up/down: 0/-16182 (-16182)
function old new delta
ide_hwifs 16920 1692 -15228
init_irq 1113 750 -363
ideprobe_init 283 138 -145
ide_pci_setup_ports 1329 1193 -136
save_match 85 - -85
ide_register_hw_with_fixup 367 287 -80
ide_setup 1364 1308 -56
is_chipset_set 40 4 -36
create_proc_ide_interfaces 225 205 -20
init_ide_data 84 67 -17
ide_probe_for_cmd640x 1198 1183 -15
ide_unregister 1452 1451 -1
Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/Kconfig | 2 +-
drivers/ide/setup-pci.c | 2 +-
include/linux/ide.h | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/ide/Kconfig~make-number-of-ide-interfaces-configurable drivers/ide/Kconfig
--- devel/drivers/ide/Kconfig~make-number-of-ide-interfaces-configurable 2006-05-13 00:14:46.000000000 -0700
+++ devel-akpm/drivers/ide/Kconfig 2006-05-13 00:14:46.000000000 -0700
@@ -54,7 +54,7 @@ if IDE
config IDE_MAX_HWIFS
int "Max IDE interfaces"
- depends on ALPHA || SUPERH || IA64
+ depends on ALPHA || SUPERH || IA64 || EMBEDDED
default 4
help
This is the maximum number of IDE hardware interfaces that will
diff -puN drivers/ide/setup-pci.c~make-number-of-ide-interfaces-configurable drivers/ide/setup-pci.c
--- devel/drivers/ide/setup-pci.c~make-number-of-ide-interfaces-configurable 2006-05-13 00:14:46.000000000 -0700
+++ devel-akpm/drivers/ide/setup-pci.c 2006-05-13 00:14:46.000000000 -0700
@@ -102,7 +102,7 @@ static ide_hwif_t *ide_match_hwif(unsign
return hwif; /* pick an unused entry */
}
}
- for (h = 0; h < 2; ++h) {
+ for (h = 0; h < 2 && h < MAX_HWIFS; ++h) {
hwif = ide_hwifs + h;
if (hwif->chipset == ide_unknown)
return hwif; /* pick an unused entry */
diff -puN include/linux/ide.h~make-number-of-ide-interfaces-configurable include/linux/ide.h
--- devel/include/linux/ide.h~make-number-of-ide-interfaces-configurable 2006-05-13 00:14:46.000000000 -0700
+++ devel-akpm/include/linux/ide.h 2006-05-13 00:14:46.000000000 -0700
@@ -252,7 +252,8 @@ static inline void ide_std_init_ports(hw
#include <asm/ide.h>
-#ifndef MAX_HWIFS
+#if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED)
+#undef MAX_HWIFS
#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
#endif
_
Patches currently in -mm which might be from mpm@xxxxxxxxxxx are
clean-up-initcall-warning-for-netconsole.patch
random-remove-redundant-sa_sample_random-from-ninjascsi.patch
add-poisonh-and-patch-primary-users.patch
when-config_base_samll=1-the-kernel-261611-cascade-in-kernel-timerc-may-enter-the-infinite-loop.patch
bloat-o-meter-gcc-4-fix.patch
random-remove-sa_sample_random-from-floppy-driver.patch
random-make-cciss-use-add_disk_randomness.patch
random-change-cpqarray-to-use-add_disk_randomness.patch
random-remove-bogus-sa_sample_random-from-at91-compact-flash-driver.patch
random-remove-redundant-sa_sample_random-from-touchscreen-drivers.patch
make-number-of-ide-interfaces-configurable.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
