[gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers/files/8.42.3: warnings.patch linux-2.6.23.patch

[William Thomson (wltjr)]

wltjr       07/11/19 01:15:04

  Added:                warnings.patch linux-2.6.23.patch
  Log:
  Bumped to latest release per bug #196820.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  x11-drivers/ati-drivers/files/8.42.3/warnings.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.42.3/warnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.42.3/warnings.patch?rev=1.1&content-type=text/plain

Index: warnings.patch
===================================================================
diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
--- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
@@ -452,7 +452,7 @@
 }
 
 static unsigned int 
-firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) 
+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt)
 {
     if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt))
     {
@@ -1491,7 +1491,8 @@
 int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst)
 {
   void *temp = src;
-  return put_user(temp, dst);
+  void *dst_temp = dst;
+  return put_user(temp, dst_temp);
 }
 
 int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst)
@@ -1883,7 +1884,7 @@
 
 __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from)
 {
-	return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
+	return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); 
 }
 
 void* ATI_API_CALL __ke_malloc(__ke_size_t size)
@@ -2813,9 +2814,9 @@
 #else
 static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */
 
-static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs)
+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1)
 {
-    irq_handler_func(irq, arg1, regs);
+    irq_handler_func(irq, arg1, NULL);
     return IRQ_HANDLED;
 }
 
@@ -2826,7 +2827,7 @@
     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)
@@ -2848,9 +2849,7 @@
 
 void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd)
 {
-#ifdef FIREGL_IOCTL_COMPAT
-    return 0;
-#else
+#ifndef FIREGL_IOCTL_COMPAT
     unregister_ioctl32_conversion(cmd);
 #endif
 }
@@ -4353,7 +4352,7 @@
 void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) 
 {
 #ifdef CONFIG_SMP
-	smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 );
+	smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 );
 #endif
 }
 
@@ -5303,7 +5302,7 @@
 /** \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) */
@@ -5344,7 +5343,7 @@
 
     slabcache_obj->routine_type = access_type;
     spin_lock_init(&(slabcache_obj->lock));
-    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj);
+    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj);
 
     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);




1.1                  x11-drivers/ati-drivers/files/8.42.3/linux-2.6.23.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.42.3/linux-2.6.23.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.42.3/linux-2.6.23.patch?rev=1.1&content-type=text/plain

Index: linux-2.6.23.patch
===================================================================
diff -Naur work_orig/common/lib/modules/fglrx/build_mod/firegl_public.c work/common/lib/modules/fglrx/build_mod/firegl_public.c
--- work_orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2007-11-11 18:33:01.000000000 -0500
+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2007-11-11 18:37:54.000000000 -0500
@@ -217,6 +217,56 @@
 #define preempt_enable()
 #endif
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
+#if defined(__i386__)
+#define ptep_test_and_clear_dirty(vma, addr, ptep) ({                  \
+       int __ret = 0;                                                  \
+       if (pte_dirty(*(ptep)))                                         \
+               __ret = test_and_clear_bit(_PAGE_BIT_DIRTY,             \
+                                               &(ptep)->pte_low);      \
+       if (__ret)                                                      \
+               pte_update((vma)->vm_mm, addr, ptep);                   \
+       __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; }
+#ifdef CONFIG_X86_PAE
+/*
+ * Is the pte executable?
+ */
+static inline int pte_x(pte_t pte)
+{
+        return !(pte_val(pte) & _PAGE_NX);
+}
+
+/*
+ * All present user-pages with !NX bit are user-executable:
+ */
+static inline int pte_exec(pte_t pte)
+{
+        return pte_user(pte) && pte_x(pte);
+}
+#else
+static inline int pte_exec(pte_t pte)
+{
+        return pte_user(pte);
+}
+#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)
+{
+       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); }
+#endif
+#endif
+
 // ============================================================
 /* globals */
 
@@ -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);	 \
     if (__dirty)					 \
         flush_tlb_page(__vma, __address);		 \
     __dirty;						 \
@@ -2937,7 +2987,7 @@
 {
     return request_irq(irq,
         (void(*)(int, void *, struct pt_regs *))handler,
-        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)
@@ -5481,7 +5531,7 @@
     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
 
     if ((slabcache_obj->cache =
-            kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
+            kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
     {
         ret = 1;
     }



-- 
gentoo-commits@g.o mailing list