Deleted Added
full compact
octeon-feature.h (232812) octeon-feature.h (242342)
1/***********************license start***************
2 * Copyright (c) 2003-2010 Cavium Inc. (support@cavium.com). All rights
3 * reserved.
4 *
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met:

--- 267 unchanged lines hidden (view full) ---

276/*
277 * Answer ``Is the bit for feature set in the bitmap?''
278 * @param feature
279 * @return 1 when the feature is present and 0 otherwise, -1 in case of error.
280 */
281#if defined(__U_BOOT__) || defined(CVMX_BUILD_FOR_LINUX_HOST) || defined(CVMX_BUILD_FOR_TOOLCHAIN)
282#define octeon_has_feature old_octeon_has_feature
283#else
1/***********************license start***************
2 * Copyright (c) 2003-2010 Cavium Inc. (support@cavium.com). All rights
3 * reserved.
4 *
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met:

--- 267 unchanged lines hidden (view full) ---

276/*
277 * Answer ``Is the bit for feature set in the bitmap?''
278 * @param feature
279 * @return 1 when the feature is present and 0 otherwise, -1 in case of error.
280 */
281#if defined(__U_BOOT__) || defined(CVMX_BUILD_FOR_LINUX_HOST) || defined(CVMX_BUILD_FOR_TOOLCHAIN)
282#define octeon_has_feature old_octeon_has_feature
283#else
284#if defined(USE_RUNTIME_MODEL_CHECKS)
284#if defined(USE_RUNTIME_MODEL_CHECKS) || (defined(__FreeBSD__) && defined(_KERNEL))
285static inline int octeon_has_feature(octeon_feature_t feature)
286{
287 int byte, bit;
288 byte = feature >> 3;
289 bit = feature & 0x7;
290
291 if (byte >= FEATURE_MAP_SIZE)
292 {

--- 25 unchanged lines hidden ---
285static inline int octeon_has_feature(octeon_feature_t feature)
286{
287 int byte, bit;
288 byte = feature >> 3;
289 bit = feature & 0x7;
290
291 if (byte >= FEATURE_MAP_SIZE)
292 {

--- 25 unchanged lines hidden ---