tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

Linus Torvalds 33bc227e 569cfaad

+4 -5
unified split
+1 -1
drivers/char/drm/drm_memory.c
··· 95 unsigned long addr; 96 unsigned int sz; 97 98 - address = __get_free_pages(GFP_KERNEL, order); 99 if (!address) 100 return 0; 101
··· 95 unsigned long addr; 96 unsigned int sz; 97 98 + address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); 99 if (!address) 100 return 0; 101
+1 -1
drivers/char/drm/drm_memory_debug.h
··· 221 } 222 spin_unlock(&DRM(mem_lock)); 223 224 - address = __get_free_pages(GFP_KERNEL, order); 225 if (!address) { 226 spin_lock(&DRM(mem_lock)); 227 ++DRM(mem_stats)[area].fail_count;
··· 221 } 222 spin_unlock(&DRM(mem_lock)); 223 224 + address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); 225 if (!address) { 226 spin_lock(&DRM(mem_lock)); 227 ++DRM(mem_stats)[area].fail_count;
+1 -1
drivers/char/drm/mga_drv.c
··· 161 * device. 162 */ 163 164 - if ((pdev->device == 0x0525) 165 && (pdev->bus->self->vendor == 0x3388) 166 && (pdev->bus->self->device == 0x0021)) { 167 return 0;
··· 161 * device. 162 */ 163 164 + if ((pdev->device == 0x0525) && pdev->bus->self 165 && (pdev->bus->self->vendor == 0x3388) 166 && (pdev->bus->self->device == 0x0021)) { 167 return 0;
+1 -2
drivers/char/drm/radeon_drv.h
··· 214 215 int microcode_version; 216 217 - int is_pci; 218 - 219 struct { 220 u32 boxes; 221 int freelist_timeouts; ··· 273 274 /* starting from here on, data is preserved accross an open */ 275 uint32_t flags; /* see radeon_chip_flags */ 276 } drm_radeon_private_t; 277 278 typedef struct drm_radeon_buf_priv {
··· 214 215 int microcode_version; 216 217 struct { 218 u32 boxes; 219 int freelist_timeouts; ··· 275 276 /* starting from here on, data is preserved accross an open */ 277 uint32_t flags; /* see radeon_chip_flags */ 278 + int is_pci; 279 } drm_radeon_private_t; 280 281 typedef struct drm_radeon_buf_priv {