Module Name: src
Committed By: riastradh
Date: Wed Jul 24 00:50:03 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_bufs.c
Log Message:
Avoid BITS_PER_LONG in drm_bufs.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.2 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.3
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.2 Tue Jul 23 21:28:21 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Jul 24 00:50:03 2013
@@ -83,14 +83,7 @@ static int drm_map_handle(struct drm_dev
int use_hashed_handle, shift;
unsigned long add;
-#if (BITS_PER_LONG == 64)
- use_hashed_handle = ((user_token & 0xFFFFFFFF00000000UL) || hashed_handle);
-#elif (BITS_PER_LONG == 32)
- use_hashed_handle = hashed_handle;
-#else
-#error Unsupported long size. Neither 64 nor 32 bits.
-#endif
-
+ use_hashed_handle = (user_token &~ 0xffffffffUL) || hashed_handle;
if (!use_hashed_handle) {
int ret;
hash->key = user_token >> PAGE_SHIFT;
