fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 08:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

some fixes from linux kernel

Browse source
This commit is contained in:
Dave Airlie 2006-01-02 03:44:23 +00:00
parent fb91c500bf
commit b2be72c444
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shared-core/sis_ds.h
View file

@ -74,7 +74,7 @@ int setDestroy(set_t * set);
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* WITTAWAY YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

4
shared-core/sis_mm.c
View file

@ -90,7 +90,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS)
{ {
drm_sis_mem_t fb; drm_sis_mem_t fb;
struct sis_memreq req; struct sis_memreq req;
drm_sis_mem_t __user *argp = (void __user *)data; drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
int retval = 0; int retval = 0;
DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb)); DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
@ -180,7 +180,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_mem_t __user *argp = (void __user *)data; drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
drm_sis_mem_t fb; drm_sis_mem_t fb;
PMemBlock block; PMemBlock block;
int retval = 0; int retval = 0;