--- ati-driver/common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2013-03-23 01:21:42.098540497 +0100
+++ ati-driver/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-03-23 01:28:45.094555023 +0100
@@ -3700,7 +3700,7 @@
                 KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
                 return -EAGAIN;
             }
-            vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
             vma->vm_ops = &vm_ops;
 			break;
 
@@ -3730,14 +3730,14 @@
                 KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
                 return -EAGAIN;
             }
-            vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
             vma->vm_ops = &vm_ops;
             }
 			break;
 #endif                    
 
         case __KE_SHM:
-            vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
             vma->vm_ops = &vm_shm_ops;
             break;
 
@@ -3745,7 +3745,7 @@
 
             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 
-            vma->vm_flags |= VM_RESERVED;
+            vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
 
             //vma->vm_flags |=  VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
             //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
@@ -3754,14 +3754,14 @@
 
         case __KE_CTX:
             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
             vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
             vma->vm_ops = &vm_ctx_ops;
             break;
 
         case __KE_PCI_BQS:
             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
+            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
             vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
             vma->vm_ops = &vm_pci_bq_ops;
             break;
@@ -3792,9 +3792,9 @@
                     return -EAGAIN;
                 }
 #ifdef __x86_64__
-                vma->vm_flags |= VM_RESERVED;
+                vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
 #else
-                vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+                vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
 #endif
                 vma->vm_ops = &vm_ops;
             }
@@ -3823,9 +3823,9 @@
                     return -EAGAIN;
                 }
 #ifdef __x86_64__
-                vma->vm_flags |= VM_RESERVED;
+                vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
 #else
-                vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+                vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
 #endif
                 vma->vm_ops = &vm_agp_bq_ops;
             }
@@ -3833,7 +3833,7 @@
 #endif /* __AGP__BUILTIN__ */
 
         case __KE_KMAP:
-		    vma->vm_flags |= VM_SHM | VM_RESERVED;
+		    vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP;
             vma->vm_ops = &vm_kmap_ops;
             if (readonly && (vma->vm_flags & VM_WRITE))
             {
@@ -3854,7 +3854,7 @@
 #endif            
             // fall through
          case __KE_GART_CACHEABLE:
-             vma->vm_flags |= VM_RESERVED;
+             vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
              vma->vm_ops = &vm_gart_ops;
              break;
         default:
--- ati-driver/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-10-23 22:44:52.000000000 +0200
+++ ati-driver/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-12-22 22:11:30.289750331 +0100
@@ -775,7 +775,9 @@
 unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
 {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
-    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
+    #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
     #else
         pInfo->video_handle = pInfo->pcidev->dev.firmware_data;