git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
nvram_64.c
diff --git
a/arch/powerpc/kernel/nvram_64.c
b/arch/powerpc/kernel/nvram_64.c
index
6960f09
..
869cebb
100644
(file)
--- a/
arch/powerpc/kernel/nvram_64.c
+++ b/
arch/powerpc/kernel/nvram_64.c
@@
-505,7
+505,7
@@
static int nvram_scan_partitions(void)
return -ENODEV;
total_size = ppc_md.nvram_size();
return -ENODEV;
total_size = ppc_md.nvram_size();
- header =
(char *)
kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
+ header = kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
if (!header) {
printk(KERN_ERR "nvram_scan_partitions: Failed kmalloc\n");
return -ENOMEM;
if (!header) {
printk(KERN_ERR "nvram_scan_partitions: Failed kmalloc\n");
return -ENOMEM;
@@
-574,7
+574,7
@@
static int __init nvram_init(void)
}
/* initialize our anchor for the nvram partition list */
}
/* initialize our anchor for the nvram partition list */
- nvram_part =
(struct nvram_partition *)
kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
+ nvram_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
if (!nvram_part) {
printk(KERN_ERR "nvram_init: Failed kmalloc\n");
return -ENOMEM;
if (!nvram_part) {
printk(KERN_ERR "nvram_init: Failed kmalloc\n");
return -ENOMEM;