--- ./firegl_public.c	2010-12-02 22:28:43.000000000 +0100
+++ ./firegl_public.c.new	2011-01-09 17:40:22.000000000 +0100
@@ -320,7 +320,7 @@
     return firegl_release((KCL_IO_FILE_Handle)filp);
 }

-int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
 {
     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
 }
@@ -407,7 +407,7 @@
 #endif
     open:    ip_firegl_open,
     release: ip_firegl_release,
-    ioctl:   ip_firegl_ioctl,
+    unlocked_ioctl:   ip_firegl_ioctl,
     mmap:    ip_firegl_mmap,

     write:   ip_firegl_write,
@@ -5107,7 +5107,7 @@
 unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
 {
     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
-    init_MUTEX(&(mutex_obj->mutex));
+    sema_init(&(mutex_obj->mutex),1);
     return 1;
 }

--- ./kcl_ioctl.c	2010-12-02 22:28:43.000000000 +0100
+++ ./kcl_ioctl.c.new	2011-01-09 17:40:22.000000000 +0100
@@ -193,7 +193,7 @@
  */
 void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
 {
-    void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
+    void __user *ret = arch_compat_alloc_user_space(size);

     /* prevent stack overflow */
     if (!access_ok(VERIFY_WRITE, ret, size))