diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2008-12-18 00:56:45 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2008-12-18 00:56:45 +0000 |
| commit | 06f9e96132f39e0e832414b4c62e2537ae135a8b (patch) | |
| tree | ee279a89a6492c3525d1582146cc5463de6cd0b5 /x11-drivers/ati-drivers/files | |
| parent | Version bump linuxwacom-0.8.2. (diff) | |
| download | gentoo-2-06f9e96132f39e0e832414b4c62e2537ae135a8b.tar.gz gentoo-2-06f9e96132f39e0e832414b4c62e2537ae135a8b.tar.bz2 gentoo-2-06f9e96132f39e0e832414b4c62e2537ae135a8b.zip | |
Try to push the patch that got left over
(Portage version: 2.1.6.1/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'x11-drivers/ati-drivers/files')
| -rw-r--r-- | x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch new file mode 100644 index 000000000000..a1b88df7fa84 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch @@ -0,0 +1,62 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 +@@ -31,6 +31,9 @@ + #include <linux/autoconf.h> + + #if !defined(CONFIG_X86_PC) ++#if !defined(CONFIG_X86_PC_XEN) ++#if !defined(CONFIG_X86_XEN) ++#if !defined(CONFIG_X86_64_XEN) + #if !defined(CONFIG_X86_64) + #if !defined(CONFIG_X86_VOYAGER) + #if !defined(CONFIG_X86_NUMAQ) +@@ -47,6 +50,9 @@ + #endif + #endif + #endif ++#endif ++#endif ++#endif + + /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines + * a static inline function that uses a GPL-only symbol in a header +--- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 +@@ -30,9 +30,13 @@ + #endif + + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +- ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE_FN io_remap_pfn_range ++#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" ++#else + #define REMAP_PAGE_RANGE_FN remap_pfn_range + #define REMAP_PAGE_RANGE_STR "remap_pfn_range" ++#endif + #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) + + #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ +@@ -43,13 +47,21 @@ + + #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ + ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE(vma,offset) \ ++ REMAP_PAGE_RANGE_FN((vma), \ ++ (vma)->vm_start, \ ++ REMAP_PAGE_RANGE_OFF(offset), \ ++ (vma)->vm_end - (vma)->vm_start, \ ++ (vma)->vm_page_prot) ++#else + #define REMAP_PAGE_RANGE(vma,offset) \ + REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ + (vma)->vm_start, \ + REMAP_PAGE_RANGE_OFF(offset), \ + (vma)->vm_end - (vma)->vm_start, \ + (vma)->vm_page_prot) +- ++#endif + + /* Page table macros */ + |