git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
kernel
/
unwind.c
diff --git
a/arch/parisc/kernel/unwind.c
b/arch/parisc/kernel/unwind.c
index 6773c582e457a15b3e9ddb5006e462754bddd06e..69dad5a850a8392f5f520dd164f4dda9a4d5445a 100644
(file)
--- a/
arch/parisc/kernel/unwind.c
+++ b/
arch/parisc/kernel/unwind.c
@@
-372,7
+372,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;
- r2 = kmalloc(sizeof(struct pt_regs), GFP_
KERNEL
);
+ r2 = kmalloc(sizeof(struct pt_regs), GFP_
ATOMIC
);
if (!r2)
return;
*r2 = *r;