patch-2.3.46 linux/arch/mips/lib/floppy-std.c

Next file: linux/arch/ppc/config.in
Previous file: linux/arch/mips/jazz/floppy-jazz.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.45/linux/arch/mips/lib/floppy-std.c linux/arch/mips/lib/floppy-std.c
@@ -102,33 +102,18 @@
 	return 0x3f0;
 }
 
-/* Pure 2^n version of get_order */
-static int __get_order(unsigned long size)
-{
-	int order;
-
-	size = (size-1) >> (PAGE_SHIFT-1);
-	order = -1;
-	do {
-		size >>= 1;
-		order++;
-	} while (size);
-	return order;
-}
-
 static unsigned long std_fd_dma_mem_alloc(unsigned long size)
 {
-	int order = __get_order(size);
 	unsigned long mem;
 
-	mem = __get_dma_pages(GFP_KERNEL,order);
+	mem = __get_dma_pages(GFP_KERNEL,get_order(size));
 
 	return mem;
 }
 
 static void std_fd_dma_mem_free(unsigned long addr, unsigned long size)
 {       
-	free_pages(addr, __get_order(size));	
+	free_pages(addr, get_order(size));	
 }
 
 static unsigned long std_fd_drive_type(unsigned long n)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)