git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
uic.c
diff --git
a/arch/powerpc/sysdev/uic.c
b/arch/powerpc/sysdev/uic.c
index
d35405c
..
466ce9a
100644
(file)
--- a/
arch/powerpc/sysdev/uic.c
+++ b/
arch/powerpc/sysdev/uic.c
@@
-258,11
+258,10
@@
static struct uic * __init uic_init_one(struct device_node *node)
BUG_ON(! of_device_is_compatible(node, "ibm,uic"));
BUG_ON(! of_device_is_compatible(node, "ibm,uic"));
- uic =
alloc_bootmem(sizeof(*uic)
);
+ uic =
kzalloc(sizeof(*uic), GFP_KERNEL
);
if (! uic)
return NULL; /* FIXME: panic? */
if (! uic)
return NULL; /* FIXME: panic? */
- memset(uic, 0, sizeof(*uic));
spin_lock_init(&uic->lock);
indexp = of_get_property(node, "cell-index", &len);
if (!indexp || (len != sizeof(u32))) {
spin_lock_init(&uic->lock);
indexp = of_get_property(node, "cell-index", &len);
if (!indexp || (len != sizeof(u32))) {