diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-12-22 21:27:09 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-12-22 21:27:09 +0100 |
| commit | 4d46dcf6570d883a6903ab2bd122c516ba122936 (patch) | |
| tree | 9366d200cbb177e79f7fd0894b90697aa880da18 | |
| parent | 06cc7bf916cd562bf23b3929ca607f66a20850f0 (diff) | |
Drop spurious changesv1.8+git20221224
| -rw-r--r-- | ipc/mach_port.c | 2 | ||||
| -rw-r--r-- | linux/dev/glue/block.c | 5 | ||||
| -rw-r--r-- | linux/src/drivers/block/ide.c | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/ipc/mach_port.c b/ipc/mach_port.c index 3b00f387..db6e05dc 100644 --- a/ipc/mach_port.c +++ b/ipc/mach_port.c @@ -534,7 +534,7 @@ mach_port_allocate( * KERN_INVALID_NAME The name doesn't denote a right. */ -static volatile boolean_t mach_port_deallocate_debug = TRUE; +static volatile boolean_t mach_port_deallocate_debug = FALSE; kern_return_t mach_port_destroy( diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 950413df..6730c5ec 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -207,10 +207,7 @@ int blk_dev_init () { #ifdef CONFIG_BLK_DEV_IDE - extern char *kernel_cmdline; - if (strncmp(kernel_cmdline, "noide", 5) && - !strstr(kernel_cmdline, " noide")) - ide_init (); + 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 f3b78831..2d0fc77e 100644 --- a/linux/src/drivers/block/ide.c +++ b/linux/src/drivers/block/ide.c @@ -3725,10 +3725,7 @@ static void probe_for_hwifs (void) #ifdef CONFIG_BLK_DEV_PROMISE init_dc4030(); #endif - extern char *kernel_cmdline; - if (strncmp(kernel_cmdline, "noahci", 6) && - !strstr(kernel_cmdline, " noahci")) - ahci_probe_pci(); + ahci_probe_pci(); } static int hwif_init (int h) |