add_blkdev_randomness() is long gone, so remove stale comments and a
lone remaining reference.
Patch is against current BK. Linus, please apply.
Robert Love
drivers/char/random.c | 3 ---
drivers/s390/char/tapeblock.c | 6 +-----
2 files changed, 1 insertion(+), 8 deletions(-)
diff -urN linux-2.5.50/drivers/char/random.c linux/drivers/char/random.c
--- linux-2.5.50/drivers/char/random.c 2002-11-27 17:35:49.000000000 -0500
+++ linux/drivers/char/random.c 2002-12-08 17:15:06.000000000 -0500
@@ -128,7 +128,6 @@
* void add_keyboard_randomness(unsigned char scancode);
* void add_mouse_randomness(__u32 mouse_data);
* void add_interrupt_randomness(int irq);
- * void add_blkdev_randomness(int irq);
*
* add_keyboard_randomness() uses the inter-keypress timing, as well as the
* scancode as random inputs into the "entropy pool".
@@ -144,8 +143,6 @@
* a better measure, since the timing of the disk interrupts are more
* unpredictable.
*
- * add_blkdev_randomness() times the finishing time of block requests.
- *
* All of these routines try to estimate how many bits of randomness a
* particular randomness source. They do this by keeping track of the
* first and second order deltas of the event timings.
diff -urN linux-2.5.50/drivers/s390/char/tapeblock.c linux/drivers/s390/char/tapeblock.c
--- linux-2.5.50/drivers/s390/char/tapeblock.c 2002-11-27 17:36:21.000000000 -0500
+++ linux/drivers/s390/char/tapeblock.c 2002-12-08 19:59:18.000000000 -0500
@@ -253,12 +253,8 @@
bh->b_reqnext = NULL;
bh->b_end_io (bh, uptodate);
}
- if (!end_that_request_first (td->blk_data.current_request, uptodate, "tBLK")) {
-#ifndef DEVICE_NO_RANDOM
- add_blkdev_randomness (MAJOR (td->blk_data.current_request->rq_dev));
-#endif
+ if (!end_that_request_first (td->blk_data.current_request, uptodate, "tBLK"))
end_that_request_last (td->blk_data.current_request);
- }
if (treq!=NULL) {
tape_remove_ccw_req(td,treq);
td->discipline->free_bread(treq);