diff options
author | V3n3RiX <venerix@rogentos.ro> | 2015-05-02 04:29:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@rogentos.ro> | 2015-05-02 04:29:43 +0100 |
commit | 2edb8d6403eb04542e79586768299fe1f3b86353 (patch) | |
tree | 73bcbe9d019492828950a747ec4b2871d8b224a5 /x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch | |
parent | 4ffd69cb11b5a883ef568cfce86f0f85a7a58d73 (diff) | |
parent | c6e3e8ad21bb3702d26e6218581524ebd3eab49a (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch')
-rw-r--r-- | x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch b/x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch new file mode 100644 index 00000000..9b321955 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch @@ -0,0 +1,72 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 0f7399d..eb23e06 100644 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -4240,8 +4240,13 @@ static void kcl_mem_pat_setup (void *info) + + if (cpu_has_pge) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0) + cr4 = read_cr4(); + write_cr4(cr4 & ~X86_CR4_PGE); ++#else ++ cr4 = __read_cr4(); ++ __write_cr4(cr4 & ~X86_CR4_PGE); ++#endif + } + __flush_tlb(); + +@@ -4254,7 +4259,11 @@ static void kcl_mem_pat_setup (void *info) + write_cr0(cr0 & 0xbfffffff); + if (cpu_has_pge) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0) + write_cr4(cr4); ++#else ++ __write_cr4(cr4); ++#endif + } + local_irq_restore(flags); + +@@ -4281,8 +4290,13 @@ static void kcl_mem_pat_restore (void *info) + + if (cpu_has_pge) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0) + cr4 = read_cr4(); + write_cr4(cr4 & ~X86_CR4_PGE); ++#else ++ cr4 = __read_cr4(); ++ __write_cr4(cr4 & ~X86_CR4_PGE); ++#endif + } + __flush_tlb(); + +@@ -4294,7 +4308,11 @@ static void kcl_mem_pat_restore (void *info) + write_cr0(cr0 & 0xbfffffff); + if (cpu_has_pge) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0) + write_cr4(cr4); ++#else ++ __write_cr4(cr4); ++#endif + } + local_irq_restore(flags); + +diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c +index 2d89eb0..6df117c 100644 +--- a/common/lib/modules/fglrx/build_mod/kcl_str.c ++++ b/common/lib/modules/fglrx/build_mod/kcl_str.c +@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const char* s1, + const char* s2, + KCL_TYPE_SizeSigned count) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0) + return strnicmp(s1, s2, count); ++#else ++ return strncasecmp(s1, s2, count); ++#endif + } + + /** \brief Locate character in string |