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>

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;