diff options
author | Matt Mackall <mpm@selenic.com> | 2008-04-29 04:03:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:24 -0400 |
commit | 433582093a9dc5454ba03b4a7ea201d85e6aa4de (patch) | |
tree | 832757582e6776012433f2878684ecc2c6aa86aa /drivers | |
parent | 1c0ad3d492adf670e47bf0a3d65c6ba5cdee0114 (diff) |
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')
-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); | |||
395 | 395 | ||
396 | struct entropy_store; | 396 | struct entropy_store; |
397 | struct entropy_store { | 397 | struct entropy_store { |
398 | /* mostly-read data: */ | 398 | /* read-only data: */ |
399 | struct poolinfo *poolinfo; | 399 | struct poolinfo *poolinfo; |
400 | __u32 *pool; | 400 | __u32 *pool; |
401 | const char *name; | 401 | const char *name; |
@@ -403,7 +403,7 @@ struct entropy_store { | |||
403 | struct entropy_store *pull; | 403 | struct entropy_store *pull; |
404 | 404 | ||
405 | /* read-write data: */ | 405 | /* read-write data: */ |
406 | spinlock_t lock ____cacheline_aligned_in_smp; | 406 | spinlock_t lock; |
407 | unsigned add_ptr; | 407 | unsigned add_ptr; |
408 | int entropy_count; | 408 | int entropy_count; |
409 | int input_rotate; | 409 | int input_rotate; |