diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-07-14 20:27:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 08:10:29 -0700 |
| commit | 26665db4f7fa71c56eeb9205e79927cfc21e70c4 (patch) | |
| tree | 8b5dc2c10b8b0aa9c1d1711daf991ae3df30db02 /kernel | |
| parent | 12dae51a7567bb1e583ee0de6af538db256504db (diff) | |
| download | linux-stable-26665db4f7fa71c56eeb9205e79927cfc21e70c4.tar.gz linux-stable-26665db4f7fa71c56eeb9205e79927cfc21e70c4.tar.bz2 linux-stable-26665db4f7fa71c56eeb9205e79927cfc21e70c4.zip | |
random: remove rand_initialize_irq()
commit c5857ccf293968348e5eb4ebedc68074de3dcda6 upstream.
With the new interrupt sampling system, we are no longer using the
timer_rand_state structure in the irq descriptor, so we can stop
initializing it now.
[ Merged in fixes from Sedat to find some last missing references to
rand_initialize_irq() ]
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -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 89a3ea82569b..b9d1d83ec381 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -890,22 +890,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) return -ENOSYS; if (!try_module_get(desc->owner)) return -ENODEV; - /* - * Some drivers like serial.c use request_irq() heavily, - * so we have to be careful not to interfere with a - * running system. - */ - if (new->flags & IRQF_SAMPLE_RANDOM) { - /* - * This function might sleep, we want to call it first, - * outside of the atomic block. - * Yes, this might clear the entropy pool if the wrong - * driver is attempted to be loaded, without actually - * installing a new handler, but is this really a problem, - * only the sysadmin is able to do this. - */ - rand_initialize_irq(irq); - } /* * Check whether the interrupt nests into another interrupt @@ -1339,7 +1323,6 @@ EXPORT_SYMBOL(free_irq); * Flags: * * IRQF_SHARED Interrupt is shared - * IRQF_SAMPLE_RANDOM The interrupt can be used for entropy * IRQF_TRIGGER_* Specify active edge(s) or level * */ |