diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 05:49:07 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 05:49:07 (GMT) |
| commit | d8762748cae4f85b3201c0304969d993b42d5258 (patch) | |
| tree | 559819d9b17e5ee305d705cf9f31ac5de2aab54a /drivers/char/drm/i915_mem.c | |
| parent | ce4633704038f9bf39f20c10691747d6fc127bf4 (diff) | |
| parent | a4e62fa031a9681477207b08391c3a5c5c831ce7 (diff) | |
| download | linux-d8762748cae4f85b3201c0304969d993b42d5258.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Manual fixups for some clashes due to re-indenting.
Diffstat (limited to 'drivers/char/drm/i915_mem.c')
| -rw-r--r-- | drivers/char/drm/i915_mem.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c index 9b1698f..13176d1 100644 --- a/drivers/char/drm/i915_mem.c +++ b/drivers/char/drm/i915_mem.c @@ -86,7 +86,7 @@ static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use) } /* Very simple allocator for agp memory, working on a static range - * already mapped into each client's address space. + * already mapped into each client's address space. */ static struct mem_block *split_block(struct mem_block *p, int start, int size, @@ -94,7 +94,8 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size, { /* Maybe cut off the start of an existing block */ if (start > p->start) { - struct mem_block *newblock = drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS); + struct mem_block *newblock = + drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS); if (!newblock) goto out; newblock->start = start; @@ -110,7 +111,8 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size, /* Maybe cut off the end of an existing block */ if (size < p->size) { - struct mem_block *newblock = drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS); + struct mem_block *newblock = + drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS); if (!newblock) goto out; newblock->start = start + size; |