patch-2.4.19 linux-2.4.19/arch/mips64/lib/floppy-std.c

• Lines: 34
• Date: Fri Aug 2 17:39:43 2002
• Orig file: linux-2.4.18/arch/mips64/lib/floppy-std.c
• Orig date: Sun Jul 9 22:18:16 2000

diff -urN linux-2.4.18/arch/mips64/lib/floppy-std.c linux-2.4.19/arch/mips64/lib/floppy-std.c
@@ -100,23 +100,9 @@
 	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);
+	int order = get_order(size);
 	unsigned long mem;
 
 	mem = __get_dma_pages(GFP_KERNEL,order);
@@ -126,7 +112,7 @@
 
 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)