| Revision 7535,
1.2 KB
checked in by alanbach-guest, 2 years ago
(diff) |
- Refreshed 05_fix_2.6.37.patch
|
| Rev | Line | |
|---|
| [7535] | 1 | diff -urN fglrx-driver-10-9//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-9.new//common/lib/modules/fglrx/build_mod/firegl_public.c |
|---|
| 2 | --- fglrx-driver-10-9//common/lib/modules/fglrx/build_mod/firegl_public.c 2010-09-01 07:05:31.000000000 -0700 |
|---|
| 3 | +++ fglrx-driver-10-9.new//common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-12 13:02:15.467799003 -0800 |
|---|
| 4 | @@ -320,7 +320,7 @@ |
|---|
| 5 | return firegl_release((KCL_IO_FILE_Handle)filp); |
|---|
| 6 | } |
|---|
| 7 | |
|---|
| 8 | -int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg) |
|---|
| 9 | +int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg) |
|---|
| 10 | { |
|---|
| 11 | return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg); |
|---|
| 12 | } |
|---|
| 13 | @@ -407,7 +407,7 @@ |
|---|
| 14 | #endif |
|---|
| 15 | open: ip_firegl_open, |
|---|
| 16 | release: ip_firegl_release, |
|---|
| 17 | - ioctl: ip_firegl_ioctl, |
|---|
| 18 | + unlocked_ioctl: ip_firegl_ioctl, |
|---|
| 19 | mmap: ip_firegl_mmap, |
|---|
| 20 | |
|---|
| 21 | write: ip_firegl_write, |
|---|
| [7493] | 22 | @@ -5094,7 +5094,11 @@ |
|---|
| 23 | unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex) |
|---|
| 24 | { |
|---|
| 25 | kasMutex_t* mutex_obj = (kasMutex_t*)hMutex; |
|---|
| 26 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) |
|---|
| 27 | + sema_init(&(mutex_obj->mutex),1); |
|---|
| 28 | +#else |
|---|
| 29 | init_MUTEX(&(mutex_obj->mutex)); |
|---|
| 30 | +#endif |
|---|
| 31 | return 1; |
|---|
| 32 | } |
|---|
| [7535] | 33 | |
|---|
Note: See
TracBrowser
for help on using the repository browser.