Skip to contentSkip to conversation

DRM compile fix

Linux-ia64 Andreas Schwab 1 participant 1 message Aug 26, 2002 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

The struct page does not have a wait queue any more.

drivers/char/drm/r128_cce.c renamed from drivers/char/drm/r128_cce.c.~1~ +7 -7
@@ -685,10 +685,10 @@ int r128_do_cleanup_cce( drm_device_t *d
 		if( !dev_priv->is_pci && dev->agp->agp_info.chipset = INTEL_460GX ) {
 			unsigned long alt_rh_off  				(unsigned long) dev_priv->ring.head;
+			struct page *p = virt_to_page((void *)alt_rh_off);
 
-			atomic_dec(&virt_to_page(alt_rh_off)->count);
-			clear_bit(PG_locked, &virt_to_page(alt_rh_off)->flags);
-			wake_up(&virt_to_page(alt_rh_off)->wait);
+			put_page(p);
+			unlock_page(p);
 			free_page(alt_rh_off);
 		}
 #endif
--- linux/drivers/char/drm/radeon_cp.c.~1~
+++ linux/drivers/char/drm/radeon_cp.c
@@ -1028,10 +1028,10 @@ int radeon_do_cleanup_cp( drm_device_t *
 		if( !dev_priv->is_pci && dev->agp->agp_info.chipset = INTEL_460GX ) {
 			unsigned long alt_rh_off  				(unsigned long) dev_priv->ring.head;
+			struct page *p = virt_to_page((void *)alt_rh_off);
 
-			atomic_dec(&virt_to_page(alt_rh_off)->count);
-			clear_bit(PG_locked, &virt_to_page(alt_rh_off)->flags);
-			wake_up(&virt_to_page(alt_rh_off)->wait);
+			put_page(p);
+			unlock_page(p);
 			free_page(alt_rh_off);
 		}
 #endif
 

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."