diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
| commit | 46864e3149aabfe369f1c469951909b9dc7d53bf (patch) | |
| tree | 5a57c938836d6f2853beaa123d568d128ab76349 /mm/memory-failure.c | |
| parent | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (diff) | |
| parent | 948a4eec975b0f231c6a55eaaff3e3bdcf4cdf70 (diff) | |
| download | linux-fsl-qoriq-46864e3149aabfe369f1c469951909b9dc7d53bf.tar.xz | |
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 5ea3cf7..56ad540 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1282,7 +1282,7 @@ void memory_failure_queue(unsigned long pfn, int trapno, int flags) mf_cpu = &get_cpu_var(memory_failure_cpu); spin_lock_irqsave(&mf_cpu->lock, proc_flags); - if (kfifo_put(&mf_cpu->fifo, &entry)) + if (kfifo_put(&mf_cpu->fifo, entry)) schedule_work_on(smp_processor_id(), &mf_cpu->work); else pr_err("Memory failure: buffer overflow when queuing memory failure at %#lx\n", |