diff options
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 8 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch | 50 |
2 files changed, 20 insertions, 38 deletions
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 40bc949..65d56b4 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -1,7 +1,7 @@ -AUX 8.42.3/ati-drivers-2.6.23.patch 3901 RMD160 7c5305d4405b1e951bef958dda92749a22b8a2d8 SHA1 a86b1ee0ab31d9cdd5cc884118e1f21bc9cf9bfa SHA256 6c00de4fcb9ff7d259f8eb7bea1b9630bdf033f894e56367f42d20623207fbad -MD5 d33ffeb2e40850ab7d9b6749778717f4 files/8.42.3/ati-drivers-2.6.23.patch 3901 -RMD160 7c5305d4405b1e951bef958dda92749a22b8a2d8 files/8.42.3/ati-drivers-2.6.23.patch 3901 -SHA256 6c00de4fcb9ff7d259f8eb7bea1b9630bdf033f894e56367f42d20623207fbad files/8.42.3/ati-drivers-2.6.23.patch 3901 +AUX 8.42.3/ati-drivers-2.6.23.patch 2899 RMD160 e42c60842515d4a18da3f2daa977babffc46d66d SHA1 bc0dfe9602e1f90e90ebe268ac1095dd63838464 SHA256 c13ce26f69f60cac8810449b29e6c6d10360a5b228e11a451458a74a095efeef +MD5 1254e2cd7d25954a14e716d556a1a789 files/8.42.3/ati-drivers-2.6.23.patch 2899 +RMD160 e42c60842515d4a18da3f2daa977babffc46d66d files/8.42.3/ati-drivers-2.6.23.patch 2899 +SHA256 c13ce26f69f60cac8810449b29e6c6d10360a5b228e11a451458a74a095efeef files/8.42.3/ati-drivers-2.6.23.patch 2899 AUX 8.42.3/ati-drivers-8.42.3-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261 MD5 40ebcdcc8f5994b0ca22d72b15301e05 files/8.42.3/ati-drivers-8.42.3-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d files/8.42.3/ati-drivers-8.42.3-warnings.patch 3262 diff --git a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch index b690a18..e02c757 100644 --- a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch +++ b/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch @@ -1,5 +1,5 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2007-10-23 19:31:26.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-10-23 19:32:07.000000000 +0200 +--- firegl_public.c 2007-10-23 23:32:06.000000000 -0500 ++++ firegl_public.c.new 2007-10-23 23:58:31.000000000 -0500 @@ -217,6 +217,56 @@ #define preempt_enable() #endif @@ -16,8 +16,8 @@ + __ret; \ +}) + -+static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_USER; } -+static inline int pte_user(pte_t pte) { return (pte).pte_low & _PAGE_USER; } ++static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_USER; } ++static inline int pte_user(pte_t pte) { return (pte).pte_low & _PAGE_USER; } +#ifdef CONFIG_X86_PAE +/* + * Is the pte executable? @@ -26,7 +26,7 @@ +{ + return !(pte_val(pte) & _PAGE_NX); +} -+ ++ +/* + * All present user-pages with !NX bit are user-executable: + */ @@ -39,34 +39,34 @@ +{ + return pte_user(pte); +} -+#endif /* PAE */ ++#endif /* PAE */ + +#elif defined(__x86_64__) +static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, -+ unsigned long addr, pte_t *ptep) ++ unsigned long addr, pte_t *ptep) +{ -+ if (!pte_dirty(*ptep)) -+ return 0; -+ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte); ++ if (!pte_dirty(*ptep)) ++ return 0; ++ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte); +} -+static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; } -+static inline int pte_exec(pte_t pte) { return !(pte_val(pte) & _PAGE_NX); } ++static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; } ++static inline int pte_exec(pte_t pte) { return !(pte_val(pte) & _PAGE_NX); } +#endif +#endif + // ============================================================ /* globals */ -@@ -2489,7 +2539,7 @@ void ATI_API_CALL __ke_put_vm_page_table +@@ -2490,7 +2540,7 @@ #ifndef ptep_clear_flush_dirty #define ptep_clear_flush_dirty(__vma, __address, __ptep) \ ({ \ - int __dirty = ptep_test_and_clear_dirty(__ptep); \ -+ int __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); \ ++ int __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); \ if (__dirty) \ flush_tlb_page(__vma, __address); \ __dirty; \ -@@ -2936,7 +2986,7 @@ int ATI_API_CALL __ke_request_irq(unsign +@@ -2937,7 +2987,7 @@ { return request_irq(irq, (void(*)(int, void *, struct pt_regs *))handler, @@ -75,25 +75,7 @@ } void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) -@@ -2959,7 +3009,7 @@ int ATI_API_CALL __ke_request_irq(unsign - irq_handler_func = handler; - return request_irq(irq, - ke_irq_handler_wrap, -- SA_SHIRQ, dev_name, dev_id); -+ IRQF_SHARED, dev_name, dev_id); - } - - void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) -@@ -5436,7 +5486,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_R - /** \brief Type definition of the structure describing Slab Cache object */ - typedef struct tag_kasSlabCache_t - { -- kmem_cache_t* cache; /* OS slab cache object */ -+ struct kmem_cache *cache; /* OS slab cache object */ - spinlock_t lock; /* OS spinlock object protecting the cache */ - unsigned int routine_type; /* Type of routine the cache might be accessed from */ - char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ -@@ -5482,7 +5532,7 @@ unsigned int ATI_API_CALL KAS_SlabCache_ +@@ -5481,7 +5531,7 @@ DBG_TRACE("creating slab object '%s'", slabcache_obj->name); if ((slabcache_obj->cache = |