diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-12-22 21:20:17 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-12-22 21:20:17 +0100 |
| commit | 06cc7bf916cd562bf23b3929ca607f66a20850f0 (patch) | |
| tree | 1f1e832b43e0183dbb31974b93b28b2f61f79df7 /linux | |
| parent | 448889a4f0c32ba8ea61f870d4edcb0e0d58af85 (diff) | |
| download | gnumach-06cc7bf916cd562bf23b3929ca607f66a20850f0.tar.gz gnumach-06cc7bf916cd562bf23b3929ca607f66a20850f0.tar.bz2 gnumach-06cc7bf916cd562bf23b3929ca607f66a20850f0.zip | |
Warn only once about not being able to recycle pages
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/dev/glue/block.c | 5 | ||||
| -rw-r--r-- | linux/src/drivers/block/ide.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 6730c5ec..950413df 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -207,7 +207,10 @@ int blk_dev_init () { #ifdef CONFIG_BLK_DEV_IDE - ide_init (); + extern char *kernel_cmdline; + if (strncmp(kernel_cmdline, "noide", 5) && + !strstr(kernel_cmdline, " noide")) + ide_init (); #endif #ifdef CONFIG_BLK_DEV_FD floppy_init (); diff --git a/linux/src/drivers/block/ide.c b/linux/src/drivers/block/ide.c index 2d0fc77e..f3b78831 100644 --- a/linux/src/drivers/block/ide.c +++ b/linux/src/drivers/block/ide.c @@ -3725,7 +3725,10 @@ static void probe_for_hwifs (void) #ifdef CONFIG_BLK_DEV_PROMISE init_dc4030(); #endif - ahci_probe_pci(); + extern char *kernel_cmdline; + if (strncmp(kernel_cmdline, "noahci", 6) && + !strstr(kernel_cmdline, " noahci")) + ahci_probe_pci(); } static int hwif_init (int h) |