]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/qc-usb/qc-usb-messenger-0.8/qc-messenger-0.8-fix
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / qc-usb / qc-usb-messenger-0.8 / qc-messenger-0.8-fix
1 diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c
2 --- qc-usb-messenger-0.8/qc-memory.c    2003-12-15 10:31:46.000000000 +0100
3 +++ qc-usb-messenger-0.8-fixed/qc-memory.c      2005-02-22 17:53:50.000000000 +0100
4 @@ -63,9 +63,9 @@
5  #endif
6  
7  #if !HAVE_VMA
8 -static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); }
9 -#undef remap_page_range
10 -#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot))
11 +static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); }
12 +#undef io_remap_page_range
13 +#define io_remap_page_range(vma, start, addr, size, prot)      qc_io_remap_page_range((start),(addr),(size),(prot))
14  #endif
15  
16  #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map)
17 @@ -230,7 +230,7 @@
18         pos = (unsigned long)src;
19         while ((long)size > 0) {
20                 physaddr = kvirt_to_pa(pos);
21 -               if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED))
22 +               if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED))
23                         return -EAGAIN;
24                 start += PAGE_SIZE;
25                 pos += PAGE_SIZE;