diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-08-27 12:13:12 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-08-27 12:13:12 +0200 |
| commit | 96983515657bfd532f4d2599df16c9d756de17ea (patch) | |
| tree | 48a6fa2b58ac65adca0649acf599b2ca8c925fd8 /arch/powerpc/sysdev | |
| parent | powerpc/powernv: Enable LEDS support (diff) | |
| parent | powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1 (diff) | |
| download | linux-96983515657bfd532f4d2599df16c9d756de17ea.tar.xz linux-96983515657bfd532f4d2599df16c9d756de17ea.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 32-bit memcpy/memset optimizations, checksum
optimizations, 85xx config fragments and updates, device tree updates,
e6500 fixes for non-SMP, and misc cleanup and minor fixes."
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/cpm_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 4f7869571290..e2ea51961979 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c @@ -147,7 +147,7 @@ unsigned long cpm_muram_alloc(unsigned long size, unsigned long align) spin_lock_irqsave(&cpm_muram_lock, flags); cpm_muram_info.alignment = align; start = rh_alloc(&cpm_muram_info, size, "commproc"); - memset(cpm_muram_addr(start), 0, size); + memset_io(cpm_muram_addr(start), 0, size); spin_unlock_irqrestore(&cpm_muram_lock, flags); return start; |