diff --git a/linux-core/nouveau_sgdma.c b/linux-core/nouveau_sgdma.c
index cc4d5a92..b967b6a5 100644
--- a/linux-core/nouveau_sgdma.c
+++ b/linux-core/nouveau_sgdma.c
@@ -48,7 +48,11 @@ nouveau_sgdma_populate(struct drm_ttm_backend *be, unsigned long num_pages,
 							 page, o,
 							 NV_CTXDMA_PAGE_SIZE,
 							 PCI_DMA_BIDIRECTIONAL);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+			if (pci_dma_mapping_error(be->dev->pdev, nvbe->pagelist[d])) {
+#else
 			if (pci_dma_mapping_error(nvbe->pagelist[d])) {
+#endif
 				be->func->clear(be);
 				DRM_ERROR("pci_map_page failed\n");
 				return -EINVAL;
@@ -223,7 +227,11 @@ nouveau_sgdma_init(struct drm_device *dev)
 
 	dev_priv->gart_info.sg_dummy_page =
 		alloc_page(GFP_KERNEL|__GFP_DMA32);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+	set_page_locked(dev_priv->gart_info.sg_dummy_page);
+#else
 	SetPageLocked(dev_priv->gart_info.sg_dummy_page);
+#endif
 	dev_priv->gart_info.sg_dummy_bus =
 		pci_map_page(dev->pdev, dev_priv->gart_info.sg_dummy_page, 0,
 			     PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
diff --git a/linux-core/nv50_kms_wrapper.c b/linux-core/nv50_kms_wrapper.c
index bf747a4c..1320e5ed 100644
--- a/linux-core/nv50_kms_wrapper.c
+++ b/linux-core/nv50_kms_wrapper.c
@@ -944,7 +944,7 @@ static enum drm_connector_status nv50_kms_connector_detect(struct drm_connector
 	hpd_detect = connector->hpd_detect(connector);
 
 	/* load detect */
-	output = connector->to_output(connector, FALSE); /* analog */
+	output = connector->to_output(connector, false); /* analog */
 	if (output && output->detect)
 		load_detect = output->detect(output);
 
@@ -1034,7 +1034,7 @@ static void nv50_kms_connector_fill_modes(struct drm_connector *drm_connector, u
 		rval = drm_add_edid_modes(drm_connector, edid);
 
 		/* Only update when relevant and when detect couldn't determine type. */
-		nv50_kms_connector_set_digital(drm_connector, edid->digital ? 1 : 0, FALSE);
+		nv50_kms_connector_set_digital(drm_connector, edid->digital ? 1 : 0, false);
 
 		kfree(edid);
 	}
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c
index 894e7336..a49befea 100644
--- a/shared-core/nouveau_object.c
+++ b/shared-core/nouveau_object.c
@@ -738,8 +738,12 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class,
 							     0,
 							     PAGE_SIZE,
 							     DMA_BIDIRECTIONAL);
-
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+					/* Not a 100% sure this is the right kdev in all cases. */
+					if (dma_mapping_error(&dev->primary->kdev, dev->sg->busaddr[idx])) {
+#else
 					if (dma_mapping_error(dev->sg->busaddr[idx])) {
+#endif
 						return -ENOMEM;
 					}
 				}