patch-2.3.46 linux/arch/ppc/kernel/pci-dma.c

• Lines: 37
• Date: Mon Feb 14 15:34:21 2000
• Orig file: v2.3.45/linux/arch/ppc/kernel/pci-dma.c
• Orig date: Thu Feb 10 17:11:04 2000

diff -u --recursive --new-file v2.3.45/linux/arch/ppc/kernel/pci-dma.c linux/arch/ppc/kernel/pci-dma.c
@@ -14,20 +14,6 @@
 #include <linux/pci.h>
 #include <asm/io.h>
 
-/* Pure 2^n version of get_order */
-extern __inline__ int __get_order(unsigned long size)
-{
-	int order;
-
-	size = (size-1) >> (PAGE_SHIFT-1);
-	order = -1;
-	do {
-		size >>= 1;
-		order++;
-	} while (size);
-	return order;
-}
-
 void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
 			   dma_addr_t *dma_handle)
 {
@@ -36,7 +22,7 @@
 
 	if (hwdev == NULL || hwdev->dma_mask != 0xffffffff)
 		gfp |= GFP_DMA;
-	ret = (void *)__get_free_pages(gfp, __get_order(size));
+	ret = (void *)__get_free_pages(gfp, get_order(size));
 
 	if (ret != NULL) {
 		memset(ret, 0, size);
@@ -48,5 +34,5 @@
 void pci_free_consistent(struct pci_dev *hwdev, size_t size,
 			 void *vaddr, dma_addr_t dma_handle)
 {
-	free_pages((unsigned long)vaddr, __get_order(size));
+	free_pages((unsigned long)vaddr, get_order(size));
 }