001-fix-compile.patch 3.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. --- a/src/include/drv_dsl_cpe_os_linux.h
  2. +++ b/src/include/drv_dsl_cpe_os_linux.h
  3. @@ -36,6 +36,7 @@
  4. #endif
  5. #include <linux/sched.h>
  6. +#include <linux/sched/signal.h>
  7. #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
  8. #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
  9. --- a/configure.in
  10. +++ b/configure.in
  11. @@ -422,7 +422,7 @@ AC_ARG_ENABLE(debug-prints,
  12. AC_SUBST([DSL_DBG_MAX_LEVEL_SET],[no])
  13. AC_SUBST([DSL_DBG_MAX_LEVEL_PRE],[n/a])
  14. - AC_SUBST([INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT],[no])
  15. + AC_SUBST([INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT],[yes])
  16. ;;
  17. no | none )
  18. AC_DEFINE(DSL_DEBUG_DISABLE,,[Disabled debug prints])
  19. @@ -433,7 +433,7 @@ AC_ARG_ENABLE(debug-prints,
  20. AC_SUBST([DSL_DBG_MAX_LEVEL_SET],[no])
  21. AC_SUBST([DSL_DBG_MAX_LEVEL_PRE],[n/a])
  22. - AC_SUBST([INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT],[yes])
  23. + AC_SUBST([INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT],[no])
  24. ;;
  25. prn | 0x1 )
  26. AC_SUBST([DSL_DEBUG_DISABLE],[no])
  27. --- a/src/common/drv_dsl_cpe_api.c
  28. +++ b/src/common/drv_dsl_cpe_api.c
  29. @@ -88,8 +88,12 @@ static DSL_uint32_t g_VRxPD_IOctlWhiteli
  30. DSL_FIO_BAND_PLAN_STATUS_GET,
  31. DSL_FIO_DBG_MODULE_LEVEL_GET,
  32. DSL_FIO_DBG_MODULE_LEVEL_SET,
  33. +#ifdef INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT
  34. +#ifndef DSL_DEBUG_DISABLE
  35. DSL_FIO_DBG_MODULE_DESTINATION_GET,
  36. DSL_FIO_DBG_MODULE_DESTINATION_SET,
  37. +#endif /* DSL_DEBUG_DISABLE*/
  38. +#endif /* INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT */
  39. DSL_FIO_OPERATOR_CONFIG_GET,
  40. DSL_FIO_OPERATOR_CONFIG_SET,
  41. /* Delimeter only. Keep it! */
  42. --- a/src/common/drv_dsl_cpe_os_linux.c
  43. +++ b/src/common/drv_dsl_cpe_os_linux.c
  44. @@ -625,7 +625,7 @@ DSL_void_t* DSL_DRV_VMalloc(
  45. DSL_DRV_size_t nSize)
  46. {
  47. /* VRX500-BU: Better to use vmalloc or vzmalloc here?! */
  48. - return __vmalloc((unsigned long)nSize, GFP_KERNEL, PAGE_KERNEL);
  49. + return __vmalloc((unsigned long)nSize, GFP_KERNEL);
  50. /* return vmalloc(nSize);*/
  51. }
  52. --- a/src/include/drv_dsl_cpe_debug.h
  53. +++ b/src/include/drv_dsl_cpe_debug.h
  54. @@ -99,6 +99,7 @@ DSL_void_t DSL_DRV_ErrorSet(DSL_void_t *
  55. /** Terminate execution if assertion fails */
  56. #define DSL_ASSERT(exp) ((void)0)
  57. + #define DSL_DEBUG_LIMIT(level, body) ((void)0)
  58. #else
  59. #define DSL_DEBUG_SET_ERROR(code) DSL_DRV_ErrorSet(pContext, code);
  60. --- a/src/pm/drv_dsl_cpe_pm_core.c
  61. +++ b/src/pm/drv_dsl_cpe_pm_core.c
  62. @@ -26,6 +26,7 @@
  63. #define DSL_DBG_BLOCK DSL_DBG_PM
  64. #ifdef __LINUX__
  65. +#ifndef DSL_DEBUG_DISABLE
  66. #define DSL_PM_CORE_RATELIMIT_INTERVAL 20 * HZ /* for each 20 seconds */
  67. #define DSL_PM_CORE_RATELIMIT_BURST 1 /* 1 occurrence */
  68. /* struct ratelimit_state to be used in DSL_DEBUG_LIMIT */
  69. @@ -33,6 +34,7 @@ static DEFINE_RATELIMIT_STATE(
  70. DSL_DBG_RATELIMIT_STRUCT_NAME(DSL_DBG_BLOCK),
  71. DSL_PM_CORE_RATELIMIT_INTERVAL,
  72. DSL_PM_CORE_RATELIMIT_BURST);
  73. +#endif
  74. #endif/* __LINUX__ */
  75. DSL_boolean_t DSL_DRV_PM_IsPmReady(