Date: Sun, 26 Feb 2006 17:57:45 -0800
From: Andrew Morton <akpm@osdl.org>
To: largret@gmail.com
Cc: 76306.1226@compuserve.com, linux-kernel@vger.kernel.org, axboe@suse.de,
       ak@muc.de
Subject: Re: OOM-killer too aggressive?
Message-Id: <20060226175745.42416125.akpm@osdl.org>
In-Reply-To: <1141002112.17427.4.camel@shogun.daga.dyndns.org>
References: <200602260938_MC3-1-B94B-EE2B@compuserve.com>
	<20060226102152.69728696.akpm@osdl.org>
	<1140988015.5178.15.camel@shogun.daga.dyndns.org>
	<20060226133140.4cf05ea5.akpm@osdl.org>
	<1140994821.5522.9.camel@shogun.daga.dyndns.org>
	<20060226162040.cb72bc31.akpm@osdl.org>
	<1141002112.17427.4.camel@shogun.daga.dyndns.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 992
Lines: 25

Chris Largret <largret@gmail.com> wrote:
>
>  drivers/block/floppy.c:3245: error: too few arguments to function
>  `__alloc_pages'

doh.

--- devel/include/asm-x86_64/floppy.h~b	2006-02-26 16:15:44.000000000 -0800
+++ devel-akpm/include/asm-x86_64/floppy.h	2006-02-26 17:57:02.000000000 -0800
@@ -40,7 +40,7 @@
 #define fd_disable_irq()        disable_irq(FLOPPY_IRQ)
 #define fd_free_irq()		free_irq(FLOPPY_IRQ, NULL)
 #define fd_get_dma_residue()    SW._get_dma_residue(FLOPPY_DMA)
-#define fd_dma_mem_alloc(size)	SW._dma_mem_alloc(size)
+#define fd_dma_mem_alloc(size)	alloc_pages(GFP_KERNEL|__GFP_DMA32, get_order(size))
 #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io)
 
 #define FLOPPY_CAN_FALLBACK_ON_NODMA
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/