diff options
| author | Imagination Technologies Ltd <gpl-support@imgtec.com> | 2011-03-08 17:34:16 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:06:48 -0700 |
| commit | 52ce8fbb4dcc0b0337c1dcf60348f4772273db83 (patch) | |
| tree | 6e8d898264d5d3b736ee16a46c777f05deef1863 /drivers/gpu/pvr/mm.h | |
| parent | f60a4091d8499f69fd16114b23756b8fbad3f633 (diff) | |
| download | kernel_samsung_tuna-52ce8fbb4dcc0b0337c1dcf60348f4772273db83.zip kernel_samsung_tuna-52ce8fbb4dcc0b0337c1dcf60348f4772273db83.tar.gz kernel_samsung_tuna-52ce8fbb4dcc0b0337c1dcf60348f4772273db83.tar.bz2 | |
gpu: pvr: Update to DDK 1.7.17.4142
Diffstat (limited to 'drivers/gpu/pvr/mm.h')
| -rw-r--r-- | drivers/gpu/pvr/mm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/pvr/mm.h b/drivers/gpu/pvr/mm.h index 047b3ad..9f91186 100644 --- a/drivers/gpu/pvr/mm.h +++ b/drivers/gpu/pvr/mm.h @@ -1,6 +1,6 @@ /********************************************************************** * - * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved. + * Copyright (C) Imagination Technologies Ltd. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -160,11 +160,11 @@ IMG_VOID LinuxMMCleanup(IMG_VOID); #if defined(DEBUG_LINUX_MEMORY_ALLOCATIONS) -#define KMallocWrapper(ui32ByteSize) _KMallocWrapper(ui32ByteSize, __FILE__, __LINE__) +#define KMallocWrapper(ui32ByteSize, uFlags) _KMallocWrapper(ui32ByteSize, uFlags, __FILE__, __LINE__) #else -#define KMallocWrapper(ui32ByteSize) _KMallocWrapper(ui32ByteSize, NULL, 0) +#define KMallocWrapper(ui32ByteSize, uFlags) _KMallocWrapper(ui32ByteSize, uFlags, NULL, 0) #endif -IMG_VOID *_KMallocWrapper(IMG_UINT32 ui32ByteSize, IMG_CHAR *szFileName, IMG_UINT32 ui32Line); +IMG_VOID *_KMallocWrapper(IMG_UINT32 ui32ByteSize, gfp_t uFlags, IMG_CHAR *szFileName, IMG_UINT32 ui32Line); #if defined(DEBUG_LINUX_MEMORY_ALLOCATIONS) |