diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 23:28:20 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:17:22 +0200 |
| commit | 2dc27f01ec3990d79fc97386459191fc3da2b02f (patch) | |
| tree | e446eccf32953ea5dab473f4db5bb1886e0f2e42 /include/asm-x86 | |
| parent | 106619c440a7cd5a100eaba38665231ab8c762b8 (diff) | |
| download | kernel_samsung_smdk4412-2dc27f01ec3990d79fc97386459191fc3da2b02f.tar.gz kernel_samsung_smdk4412-2dc27f01ec3990d79fc97386459191fc3da2b02f.tar.bz2 kernel_samsung_smdk4412-2dc27f01ec3990d79fc97386459191fc3da2b02f.zip | |
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 <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | 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 99583b39d21..cca9be7f6c8 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)); } |