diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2013-06-04 11:23:46 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:17:00 -0700 |
| commit | 567ebbd2ed6a8312058dec486f1f31a0ce3a4e91 (patch) | |
| tree | a0220033f47378a8fe57d4e5cee09bdb0152ea22 /drivers/video/tegra/nvmap/nvmap_ioctl.c | |
| parent | e940dd8d5cf28cee95aff78a062a6f5a090f06bd (diff) | |
video: tegra: add config option for nvmap handle marshalling
update code to perform handle marshalling based on config option
Change-Id: If7dd8a20088dfa9d593f799ec9ceab006b4a6880
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/235525
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Bo Yan <byan@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/nvmap/nvmap_ioctl.c')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap_ioctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c index b9c8ecf1fbfd..bd35cc68874f 100644 --- a/drivers/video/tegra/nvmap/nvmap_ioctl.c +++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c @@ -59,8 +59,6 @@ static int cache_maint(struct nvmap_client *client, struct nvmap_handle *h, unsigned long start, unsigned long end, unsigned int op, unsigned int allow_deferred); -#define NVMAP_USE_XOR_HASHING 0 - #ifdef CONFIG_COMPAT ulong unmarshal_user_handle(__u32 handle) { @@ -86,7 +84,7 @@ ulong unmarshal_user_handle(struct nvmap_handle *handle) if ((ulong)handle == 0) return (ulong)handle; -#if NVMAP_USE_XOR_HASHING +#ifdef CONFIG_NVMAP_HANDLE_MARSHAL return (ulong)handle ^ NVMAP_XOR_HASH_MASK; #else return (ulong)handle; @@ -98,7 +96,7 @@ struct nvmap_handle *marshal_kernel_handle(ulong handle) if (handle == 0) return (struct nvmap_handle *)handle; -#if NVMAP_USE_XOR_HASHING +#ifdef CONFIG_NVMAP_HANDLE_MARSHAL return (struct nvmap_handle *)(handle ^ NVMAP_XOR_HASH_MASK); #else return (struct nvmap_handle *)handle; |