patch-2.3.46 linux/arch/alpha/kernel/pci_iommu.c

• Lines: 39
• Date: Mon Feb 14 15:34:21 2000
• Orig file: v2.3.45/linux/arch/alpha/kernel/pci_iommu.c
• Orig date: Sun Feb 13 19:29:03 2000

diff -u --recursive --new-file v2.3.45/linux/arch/alpha/kernel/pci_iommu.c linux/arch/alpha/kernel/pci_iommu.c
@@ -39,20 +39,6 @@
 {
 	return (bytes + PAGE_SIZE - 1) >> PAGE_SHIFT;
 }
-
-static inline long
-calc_order(long size)
-{
-	int order;
-
-	size = (size-1) >> (PAGE_SHIFT-1);
-	order = -1;
-	do {
-		size >>= 1;
-		order++;
-	} while (size);
-	return order;
-}
 
 struct pci_iommu_arena *
 iommu_arena_new(dma_addr_t base, unsigned long window_size,
@@ -248,7 +234,7 @@
 pci_alloc_consistent(struct pci_dev *pdev, long size, dma_addr_t *dma_addrp)
 {
 	void *cpu_addr;
-	long order = calc_order(size);
+	long order = get_order(size);
 
 	cpu_addr = (void *)__get_free_pages(GFP_ATOMIC, order);
 	if (! cpu_addr) {
@@ -285,7 +271,7 @@
 		    dma_addr_t dma_addr)
 {
 	pci_unmap_single(pdev, dma_addr, size);
-	free_pages((unsigned long)cpu_addr, calc_order(size));
+	free_pages((unsigned long)cpu_addr, get_order(size));
 
 	DBGA2("pci_free_consistent: [%x,%lx] from %p\n",
 	      dma_addr, size, __builtin_return_address(0));