diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/gpio.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/axisflashmap.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/gpio.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/cris/kernel/profile.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index 4fa81abab0c7..ffade19a14e6 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
@@ -516,7 +516,7 @@ static int __init init_axis_flash(void) | |||
516 | #else | 516 | #else |
517 | struct mtd_info *mtd_ram; | 517 | struct mtd_info *mtd_ram; |
518 | 518 | ||
519 | mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info), | 519 | mtd_ram = kmalloc(sizeof(struct mtd_info), |
520 | GFP_KERNEL); | 520 | GFP_KERNEL); |
521 | if (!mtd_ram) { | 521 | if (!mtd_ram) { |
522 | panic("axisflashmap couldn't allocate memory for " | 522 | panic("axisflashmap couldn't allocate memory for " |
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c index fcba6632ed7b..9aba18b931dd 100644 --- a/arch/cris/arch-v10/drivers/gpio.c +++ b/arch/cris/arch-v10/drivers/gpio.c | |||
@@ -440,7 +440,7 @@ gpio_open(struct inode *inode, struct file *filp) | |||
440 | if (p > GPIO_MINOR_LAST) | 440 | if (p > GPIO_MINOR_LAST) |
441 | return -EINVAL; | 441 | return -EINVAL; |
442 | 442 | ||
443 | priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private), | 443 | priv = kmalloc(sizeof(struct gpio_private), |
444 | GFP_KERNEL); | 444 | GFP_KERNEL); |
445 | 445 | ||
446 | if (!priv) | 446 | if (!priv) |
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c index 41952320e00a..5180d45412fc 100644 --- a/arch/cris/arch-v32/drivers/axisflashmap.c +++ b/arch/cris/arch-v32/drivers/axisflashmap.c | |||
@@ -427,7 +427,7 @@ static int __init init_axis_flash(void) | |||
427 | #else | 427 | #else |
428 | struct mtd_info *mtd_ram; | 428 | struct mtd_info *mtd_ram; |
429 | 429 | ||
430 | mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info), | 430 | mtd_ram = kmalloc(sizeof(struct mtd_info), |
431 | GFP_KERNEL); | 431 | GFP_KERNEL); |
432 | if (!mtd_ram) { | 432 | if (!mtd_ram) { |
433 | panic("axisflashmap couldn't allocate memory for " | 433 | panic("axisflashmap couldn't allocate memory for " |
diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c index c3f876b4da6b..08d36f0955c6 100644 --- a/arch/cris/arch-v32/drivers/gpio.c +++ b/arch/cris/arch-v32/drivers/gpio.c | |||
@@ -423,7 +423,7 @@ gpio_open(struct inode *inode, struct file *filp) | |||
423 | if (p > GPIO_MINOR_LAST) | 423 | if (p > GPIO_MINOR_LAST) |
424 | return -EINVAL; | 424 | return -EINVAL; |
425 | 425 | ||
426 | priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private), | 426 | priv = kmalloc(sizeof(struct gpio_private), |
427 | GFP_KERNEL); | 427 | GFP_KERNEL); |
428 | 428 | ||
429 | if (!priv) | 429 | if (!priv) |
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 99e59b3eacf8..7cd6ac803409 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
@@ -686,7 +686,7 @@ keep_debug_flags(unsigned long oldccs, unsigned long oldspc, | |||
686 | int __init | 686 | int __init |
687 | cris_init_signal(void) | 687 | cris_init_signal(void) |
688 | { | 688 | { |
689 | u16* data = (u16*)kmalloc(PAGE_SIZE, GFP_KERNEL); | 689 | u16* data = kmalloc(PAGE_SIZE, GFP_KERNEL); |
690 | 690 | ||
691 | /* This is movu.w __NR_sigreturn, r9; break 13; */ | 691 | /* This is movu.w __NR_sigreturn, r9; break 13; */ |
692 | data[0] = 0x9c5f; | 692 | data[0] = 0x9c5f; |
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c index 69c52189f044..f60ab785f235 100644 --- a/arch/cris/kernel/profile.c +++ b/arch/cris/kernel/profile.c | |||
@@ -59,7 +59,7 @@ static int | |||
59 | __init init_cris_profile(void) | 59 | __init init_cris_profile(void) |
60 | { | 60 | { |
61 | struct proc_dir_entry *entry; | 61 | struct proc_dir_entry *entry; |
62 | sample_buffer = (char*)kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL); | 62 | sample_buffer = kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL); |
63 | sample_buffer_pos = sample_buffer; | 63 | sample_buffer_pos = sample_buffer; |
64 | entry = create_proc_entry("system_profile", S_IWUSR | S_IRUGO, NULL); | 64 | entry = create_proc_entry("system_profile", S_IWUSR | S_IRUGO, NULL); |
65 | if (entry) { | 65 | if (entry) { |