diff options
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 8c548232ba39..5e42eb119677 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -893,22 +893,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) | |||
893 | return -ENOSYS; | 893 | return -ENOSYS; |
894 | if (!try_module_get(desc->owner)) | 894 | if (!try_module_get(desc->owner)) |
895 | return -ENODEV; | 895 | return -ENODEV; |
896 | /* | ||
897 | * Some drivers like serial.c use request_irq() heavily, | ||
898 | * so we have to be careful not to interfere with a | ||
899 | * running system. | ||
900 | */ | ||
901 | if (new->flags & IRQF_SAMPLE_RANDOM) { | ||
902 | /* | ||
903 | * This function might sleep, we want to call it first, | ||
904 | * outside of the atomic block. | ||
905 | * Yes, this might clear the entropy pool if the wrong | ||
906 | * driver is attempted to be loaded, without actually | ||
907 | * installing a new handler, but is this really a problem, | ||
908 | * only the sysadmin is able to do this. | ||
909 | */ | ||
910 | rand_initialize_irq(irq); | ||
911 | } | ||
912 | 896 | ||
913 | /* | 897 | /* |
914 | * Check whether the interrupt nests into another interrupt | 898 | * Check whether the interrupt nests into another interrupt |
@@ -1354,7 +1338,6 @@ EXPORT_SYMBOL(free_irq); | |||
1354 | * Flags: | 1338 | * Flags: |
1355 | * | 1339 | * |
1356 | * IRQF_SHARED Interrupt is shared | 1340 | * IRQF_SHARED Interrupt is shared |
1357 | * IRQF_SAMPLE_RANDOM The interrupt can be used for entropy | ||
1358 | * IRQF_TRIGGER_* Specify active edge(s) or level | 1341 | * IRQF_TRIGGER_* Specify active edge(s) or level |
1359 | * | 1342 | * |
1360 | */ | 1343 | */ |