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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
parisc
/
kernel
/
unwind.c
diff --git
a/arch/parisc/kernel/unwind.c
b/arch/parisc/kernel/unwind.c
index
cc1c1af
..
c10ab47
100644
(file)
--- a/
arch/parisc/kernel/unwind.c
+++ b/
arch/parisc/kernel/unwind.c
@@
-8,7
+8,6
@@
* understand what is happening here
*/
* understand what is happening here
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/slab.h>
@@
-344,7
+343,7
@@
void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info, struct
struct pt_regs *r = &t->thread.regs;
struct pt_regs *r2;
struct pt_regs *r = &t->thread.regs;
struct pt_regs *r2;
- r2 =
(struct pt_regs *)
kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
+ r2 = kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
if (!r2)
return;
*r2 = *r;
if (!r2)
return;
*r2 = *r;