SOURCES: X11-driver-firegl-ioctl32.patch - outdated part removed. ...

[pluto]

Author: pluto                        Date: Sat Nov  5 21:22:09 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- outdated part removed.
- check access_ok() retval in the right way.

---- Files affected:
SOURCES:
   X11-driver-firegl-ioctl32.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/X11-driver-firegl-ioctl32.patch
diff -u SOURCES/X11-driver-firegl-ioctl32.patch:1.2 SOURCES/X11-driver-firegl-ioctl32.patch:1.3
--- SOURCES/X11-driver-firegl-ioctl32.patch:1.2	Thu Nov  3 14:19:45 2005
+++ SOURCES/X11-driver-firegl-ioctl32.patch	Sat Nov  5 22:22:04 2005
@@ -2,17 +2,6 @@
 
 --- X11-driver-firegl-8.16.20/lib/modules/fglrx/build_mod/firegl_public.c.orig	2005-11-02 20:29:43.535048712 -0800
 +++ X11-driver-firegl-8.16.20/lib/modules/fglrx/build_mod/firegl_public.c	2005-11-02 20:27:19.013019400 -0800
-@@ -121,9 +121,8 @@
- #endif
- 
- #ifdef __x86_64__
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
- #include "asm/ioctl32.h"
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
--#include "linux/syscalls.h"
- #endif
- #endif
- 
 @@ -191,6 +190,16 @@ _syscall3( int, modify_ldt, int, func, v
  // ============================================================
  /* globals */
@@ -43,7 +32,7 @@
  int ATI_API_CALL __ke_verify_area(int type, const void * addr, unsigned long size)
  {
 -    return verify_area(type, addr, size);
-+    return access_ok(type, addr, size);
++    return (access_ok(type, addr, size) ? 0 : -EFAULT);
  }
  
  int ATI_API_CALL __ke_get_pci_device_info(__ke_pci_dev_t* dev, __ke_pci_device_info_t *pinfo)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/X11-driver-firegl-ioctl32.patch?r1=1.2&r2=1.3&f=u