diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 23:56:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 23:56:42 +0100 |
| commit | 1de8cd3cb9f61e854e743c7210df43db517d4832 (patch) | |
| tree | 2b69c5ba5e4094037fa04d0fcb6c4537c222cde8 /arch/parisc/kernel/unwind.c | |
| parent | 1eb1b3b65dc3e3ffcc6a60e115c085c0c11c1077 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
| download | blackbird-op-linux-1de8cd3cb9f61e854e743c7210df43db517d4832.tar.gz blackbird-op-linux-1de8cd3cb9f61e854e743c7210df43db517d4832.zip | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/parisc/kernel/unwind.c')
| -rw-r--r-- | arch/parisc/kernel/unwind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c index 6773c582e457..69dad5a850a8 100644 --- 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; |
