From e4d0ae4ff16dffc3d8b77b9e8f3905ac8eda9fa3 Mon Sep 17 00:00:00 2001 From: guillemj <> Date: Sun, 3 Dec 2006 08:16:01 +0000 Subject: [PATCH] * 3dfx_device.c (my_remap_page_range): Define as remap_pfn_range for linux 2.6.10 or higher. --- Device3Dfx/3dfx_driver.c | 5 ++++- Device3Dfx/ChangeLog | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Device3Dfx/3dfx_driver.c b/Device3Dfx/3dfx_driver.c index 6092881..4b93de7 100644 --- a/Device3Dfx/3dfx_driver.c +++ b/Device3Dfx/3dfx_driver.c @@ -191,7 +191,10 @@ static struct pci_card { #define VM_OFFSET_ALIGNED(vma) ((vma->vm_pgoff) & ~PAGE_MASK) #endif -#if KERNEL_MIN_VER(2,6,0) +#if KERNEL_MIN_VER(2,6,10) +#define my_remap_page_range(vma, start, ofs, len, prot) \ + remap_pfn_range(vma, start, ofs >> PAGE_SHIFT, len, prot) +#elif KERNEL_MIN_VER(2,6,0) #define my_remap_page_range(vma, start, ofs, len, prot) \ remap_page_range(vma, start, ofs, len, prot) #else diff --git a/Device3Dfx/ChangeLog b/Device3Dfx/ChangeLog index 104d6f5..fbf264b 100644 --- a/Device3Dfx/ChangeLog +++ b/Device3Dfx/ChangeLog @@ -1,3 +1,8 @@ +2006-12-03 Guillem Jover + + * 3dfx_device.c (my_remap_page_range): Define as remap_pfn_range for + linux 2.6.10 or higher. + 2006-12-03 Guillem Jover Use the "new" kernel level exception handling for memory accesses