From bec49b27c82c940d2fa84300c807c45380f97d9d Mon Sep 17 00:00:00 2001
From: Ian Molton <ian.molton@collabora.co.uk>
Date: Thu, 3 Dec 2009 13:50:42 +0800
Subject: [PATCH] --- yaml --- r: 173121 b: refs/heads/master c:
 eed89d0f9d3383851cec634565a6414fae70fe91 h: refs/heads/master i:   173119:
 ec6fb4df3bc08e11b7f4285500b0886d14f644b7 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/hw_random/core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd00aa3acb0c..10d1c06aeaa3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb347d98079a547e80bd4722dee1de61e4dca0e8
+refs/heads/master: eed89d0f9d3383851cec634565a6414fae70fe91
diff --git a/trunk/drivers/char/hw_random/core.c b/trunk/drivers/char/hw_random/core.c
index 5c2d13c6e189..8b7d56a0fe3a 100644
--- a/trunk/drivers/char/hw_random/core.c
+++ b/trunk/drivers/char/hw_random/core.c
@@ -53,7 +53,8 @@ static struct hwrng *current_rng;
 static LIST_HEAD(rng_list);
 static DEFINE_MUTEX(rng_mutex);
 static int data_avail;
-static u8 rng_buffer[SMP_CACHE_BYTES] __cacheline_aligned;
+static u8 rng_buffer[SMP_CACHE_BYTES < 32 ? 32 : SMP_CACHE_BYTES]
+	__cacheline_aligned;
 
 static inline int hwrng_init(struct hwrng *rng)
 {