aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-07-14 20:27:52 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-15 12:04:28 -0700
commitb6b847a93be87fc9974d8232984668a5a59754df (patch)
treeae0c3cb7fe98627cd7e61d5f8fbae68fd3704d95 /kernel
parentf99ef862a7235bb06e963bd99e3c4287f5b8f6fd (diff)
downloadkernel_samsung_smdk4412-b6b847a93be87fc9974d8232984668a5a59754df.tar.gz
kernel_samsung_smdk4412-b6b847a93be87fc9974d8232984668a5a59754df.tar.bz2
kernel_samsung_smdk4412-b6b847a93be87fc9974d8232984668a5a59754df.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.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index df8136fff8c..fa4a70ee272 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -886,22 +886,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
if (desc->irq_data.chip == &no_irq_chip)
return -ENOSYS;
- /*
- * 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
@@ -1325,7 +1309,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
*
*/