diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2012-08-19 20:56:42 -0300 |
|---|---|---|
| committer | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2012-08-19 20:56:42 -0300 |
| commit | e99bbab50842170c4d9854ebf0a46796493df0a0 (patch) | |
| tree | e61e9884e437cfef6d5eec1ef73ce05da2c56d62 /sgx/services4/srvkm/include/osfunc.h | |
| parent | 7fb51412b963536bb6d07648a4fc4b5e11485ae9 (diff) | |
Imported Upstream version 1.9.0.5.1.1 (ARMHF)upstream/1.9.0.5.1.1upstream
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Diffstat (limited to 'sgx/services4/srvkm/include/osfunc.h')
| -rw-r--r-- | sgx/services4/srvkm/include/osfunc.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sgx/services4/srvkm/include/osfunc.h b/sgx/services4/srvkm/include/osfunc.h index 953a4b3..9e879c8 100644 --- a/sgx/services4/srvkm/include/osfunc.h +++ b/sgx/services4/srvkm/include/osfunc.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #ifdef DEBUG_RELEASE_BUILD #pragma optimize( "", off ) @@ -113,7 +112,7 @@ PVRSRV_ERROR OSUnReservePhys(IMG_VOID *pvCpuVAddr, IMG_SIZE_T ui32Bytes, IMG_UIN * INVALIDATE Invalidate w/o flush */ -#if (defined(__linux__) && defined(__KERNEL__)) || (UNDER_CE >= 600) +#if defined(__linux__) && defined(__KERNEL__) IMG_VOID OSFlushCPUCacheKM(IMG_VOID); @@ -191,7 +190,7 @@ static INLINE IMG_BOOL OSInvalidateCPUCacheRangeKM(IMG_HANDLE hOSMemHandle, #endif /* defined(__linux__) && defined(__KERNEL__) */ -#if (defined(__linux__) || defined(__QNXNTO__)) +#if defined(__linux__) || defined(__QNXNTO__) PVRSRV_ERROR OSRegisterDiscontigMem(IMG_SYS_PHYADDR *pBasePAddr, IMG_VOID *pvCpuVAddr, IMG_SIZE_T ui32Bytes, @@ -238,7 +237,7 @@ static INLINE PVRSRV_ERROR OSUnRegisterDiscontigMem(IMG_VOID *pvCpuVAddr, #endif /* defined(__linux__) */ -#if (defined(__linux__) || defined(__QNXNTO__)) +#if defined(__linux__) || defined(__QNXNTO__) #ifdef INLINE_IS_PRAGMA #pragma inline(OSReserveDiscontigPhys) #endif @@ -679,7 +678,7 @@ IMG_BOOL OSAccessOK(IMG_VERIFY_TEST eVerification, IMG_VOID *pvUserPtr, IMG_SIZE PVRSRV_ERROR OSCopyToUser(IMG_PVOID pvProcess, IMG_VOID *pvDest, IMG_VOID *pvSrc, IMG_SIZE_T ui32Bytes); PVRSRV_ERROR OSCopyFromUser(IMG_PVOID pvProcess, IMG_VOID *pvDest, IMG_VOID *pvSrc, IMG_SIZE_T ui32Bytes); -#if (defined(__linux__) || defined(__QNXNTO__)) +#if defined(__linux__) || defined(__QNXNTO__) PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID* pvCPUVAddr, IMG_SIZE_T ui32Bytes, IMG_SYS_PHYADDR *psSysPAddr, |