diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-30 15:19:31 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-30 15:19:31 +1100 |
| commit | dece8ada993e1764a115bdff0f1effffaa5fc8dc (patch) | |
| tree | ba35b26bce046c3062bf13b2fd7611cf9265e66e /arch/powerpc/sysdev | |
| parent | a68c33f3592eef63304a5f5ab68466539ccac56c (diff) | |
| parent | f991db1cf1bdca43675b5d2df0af991719727029 (diff) | |
| download | op-kernel-dev-dece8ada993e1764a115bdff0f1effffaa5fc8dc.zip op-kernel-dev-dece8ada993e1764a115bdff0f1effffaa5fc8dc.tar.gz | |
Merge branch 'merge' into next
Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_ocm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_ocm.c b/arch/powerpc/sysdev/ppc4xx_ocm.c index b7c4345..85d9e37 100644 --- a/arch/powerpc/sysdev/ppc4xx_ocm.c +++ b/arch/powerpc/sysdev/ppc4xx_ocm.c @@ -339,7 +339,7 @@ void *ppc4xx_ocm_alloc(phys_addr_t *phys, int size, int align, if (IS_ERR_VALUE(offset)) continue; - ocm_blk = kzalloc(sizeof(struct ocm_block *), GFP_KERNEL); + ocm_blk = kzalloc(sizeof(struct ocm_block), GFP_KERNEL); if (!ocm_blk) { printk(KERN_ERR "PPC4XX OCM: could not allocate ocm block"); rh_free(ocm_reg->rh, offset); |
