Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2dc27f01ec3990d79fc97386459191fc3da2b02f
Commit:     2dc27f01ec3990d79fc97386459191fc3da2b02f
Parent:     106619c440a7cd5a100eaba38665231ab8c762b8
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 15 23:28:20 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:17:22 2007 +0200

    x86: apply missing DMA/OOM prevention to floppy_32.h
    
    commit 554d284ba90bc2306c31e5363789f05c320969c3 added _GPF_NORETRY
    to floppy_64.h to prevent OOM killer on floppy DMA allocations.
    
    Apply the same to the 32 bit variant.
    
    Found during the attempt to unify the _32/_64 variants. Seperate commit
    to document the resulting code change.
    
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 include/asm-x86/floppy_32.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-x86/floppy_32.h b/include/asm-x86/floppy_32.h
index 99583b3..cca9be7 100644
--- a/include/asm-x86/floppy_32.h
+++ b/include/asm-x86/floppy_32.h
@@ -154,7 +154,7 @@ static int fd_request_irq(void)
 
 static unsigned long dma_mem_alloc(unsigned long size)
 {
-       return __get_dma_pages(GFP_KERNEL,get_order(size));
+       return __get_dma_pages(GFP_KERNEL | __GFP_NORETRY, get_order(size));
 }
 
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to