diff options
| author |   Matt Mackall <mpm@selenic.com> | 2008-04-29 01:03:01 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 08:06:24 -0700 |
| commit | 433582093a9dc5454ba03b4a7ea201d85e6aa4de (patch) | |
| tree | 832757582e6776012433f2878684ecc2c6aa86aa /drivers/char/random.c | |
| parent | random: make backtracking attacks harder (diff) | |
| download | linux-dev-433582093a9dc5454ba03b4a7ea201d85e6aa4de.tar.xz linux-dev-433582093a9dc5454ba03b4a7ea201d85e6aa4de.zip | |
random: remove cacheline alignment for locks
Earlier changes greatly reduce the number of times we grab the lock
per output byte, so we shouldn't need this particular hack any more.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/random.c')
| -rw-r--r-- | drivers/char/random.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index e52f64cbef04..973706e97e77 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -395,7 +395,7 @@ module_param(debug, bool, 0644); struct entropy_store; struct entropy_store { - /* mostly-read data: */ + /* read-only data: */ struct poolinfo *poolinfo; __u32 *pool; const char *name; @@ -403,7 +403,7 @@ struct entropy_store { struct entropy_store *pull; /* read-write data: */ - spinlock_t lock ____cacheline_aligned_in_smp; + spinlock_t lock; unsigned add_ptr; int entropy_count; int input_rotate; |