aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-08-17 13:30:29 -0400
committerTejun Heo <tj@kernel.org>2014-08-26 13:45:45 -0400
commit1b2a1a7e8ad1144dc3f676f2651cb84e01548d59 (patch)
treeeac47df43cdac82e47df9138bee6387fd7802651 /drivers/char
parenta0b6bc63a20a91faef0127cc61cca6d06ee737df (diff)
drivers/char/random: Replace __get_cpu_var uses
A single case of using __get_cpu_var for address calculation. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index c18d41db83d8..82759cef9043 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -874,7 +874,7 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
874void add_interrupt_randomness(int irq, int irq_flags) 874void add_interrupt_randomness(int irq, int irq_flags)
875{ 875{
876 struct entropy_store *r; 876 struct entropy_store *r;
877 struct fast_pool *fast_pool = &__get_cpu_var(irq_randomness); 877 struct fast_pool *fast_pool = this_cpu_ptr(&irq_randomness);
878 struct pt_regs *regs = get_irq_regs(); 878 struct pt_regs *regs = get_irq_regs();
879 unsigned long now = jiffies; 879 unsigned long now = jiffies;
880 cycles_t cycles = random_get_entropy(); 880 cycles_t cycles = random_get_entropy();