Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4b560fde06aeb342f3ff0bce924627ab722d251a
Commit: 4b560fde06aeb342f3ff0bce924627ab722d251a
Parent: 99da6d861c659bb1a961b70f50fad268b9ed5a5f
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 19 09:08:21 2007 +1100
Committer: Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Mar 19 09:08:21 2007 +1100
drm: fix warning in drm_fops.c
drivers/char/drm/drm_fops.c: In function 'drm_setup':
drivers/char/drm/drm_fops.c:60: warning: comparison of distinct pointer
types lacks a cast
Unfortunately PAGE_SIZE has different types on different architectures.
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
drivers/char/drm/drm_fops.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index afe5f07..314abd9 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -57,7 +57,7 @@ static int drm_setup(drm_device_t * dev)
dev->magicfree.next = NULL;
/* prebuild the SAREA */
- sareapage = max(SAREA_MAX, PAGE_SIZE);
+ sareapage = max_t(unsigned, SAREA_MAX, PAGE_SIZE);
i = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
if (i != 0)
return i;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
