summaryrefslogtreecommitdiffstats
path: root/drivers/char/random.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
commit27cfca1ec98e91261b1a5355d10a8996464b63af (patch)
tree8e895a53e372fa682b4c0a585b9377d67ed70d0e /drivers/char/random.c
parent6a76fb7214c477ccf6582bd79c5b4ccc4f9c41b1 (diff)
Look Ma' what I found on my harddisk ...
o New faster syscalls for 2.1.x, too o Upgrade to 2.1.89. Don't try to run this. It's flaky as hell. But feel free to debug ...
Diffstat (limited to 'drivers/char/random.c')
-rw-r--r--drivers/char/random.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 6b8a2f12b..226694a71 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -585,7 +585,7 @@ static void add_timer_randomness(struct random_bucket *r,
begin_benchmark(&timer_benchmark);
#endif
#if defined (__i386__)
- if (x86_capability & 16) {
+ if (boot_cpu_data.x86_capability & 16) {
unsigned long low, high;
__asm__(".byte 0x0f,0x31"
:"=a" (low), "=d" (high));
@@ -1140,8 +1140,8 @@ random_poll(struct file *file, poll_table * wait)
{
unsigned int mask;
- poll_wait(&random_read_wait, wait);
- poll_wait(&random_write_wait, wait);
+ poll_wait(file, &random_read_wait, wait);
+ poll_wait(file, &random_write_wait, wait);
mask = 0;
if (random_state.entropy_count >= WAIT_INPUT_BITS)
mask |= POLLIN | POLLRDNORM;