diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-02-18 02:53:36 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-02-18 02:53:36 +0000 |
| commit | 4791dc885619b1a6460c1fcf48f648945feea4d3 (patch) | |
| tree | c8836b6b99a1bc7f2c455d2ad4089939f5098118 /linux-core/drm_context.c | |
| parent | 585f34c3e533cafd687beba161d6d0379b52bb47 (diff) | |
major realigment of DRM CVS with kernel code, makes integration much easier
Diffstat (limited to 'linux-core/drm_context.c')
| -rw-r--r-- | linux-core/drm_context.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c index 1fcd125e..748a2a61 100644 --- a/linux-core/drm_context.c +++ b/linux-core/drm_context.c @@ -235,7 +235,8 @@ int drm_getsareactx(struct inode *inode, struct file *filp, request.handle = NULL; list_for_each_entry(_entry, &dev->maplist->head,head) { if (_entry->map == map) { - request.handle = (void *)(unsigned long)_entry->user_token; + request.handle = + (void *)(unsigned long)_entry->user_token; break; } } @@ -341,7 +342,7 @@ static int drm_context_switch(drm_device_t * dev, int old, int new) * hardware lock is held, clears the drm_device::context_flag and wakes up * drm_device::context_wait. */ -int drm_context_switch_complete(drm_device_t * dev, int new) +static int drm_context_switch_complete(drm_device_t * dev, int new) { dev->last_context = new; /* PRE/POST: This is the _only_ writer. */ dev->last_switch = jiffies; |