starlingx
/
metal
Code Issues Proposed changes

Update host watchdog CONFIG_MASK 

The CONFIG_MASK in hostw.h includes CONFIG_START_DELAY, which
correlates to an option that is not actually used in host watchdog. As
a result, the recently added check that verifies all options in the
CONFIG_MASK are set fails, and the host watchdog fails to launch.

This update removes the unused CONFIG_START_DELAY bit from
CONFIG_MASK.

Change-Id: I330e15520bc0f01a6cbfd4f83a1953c1c737da2b
Partial-Bug: 1835370
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2019-10-30 16:40:56 -04:00
parent 86b70733cc
commit e356019f95
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mtce/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
SRC_DIR="src"
TIS_PATCH_VER=154
TIS_PATCH_VER=155
BUILD_IS_SLOW=5

2
mtce/src/hostw/hostw.h
View File

@ -69,7 +69,6 @@ using namespace std;
#define CONFIG_HOSTWD_REBOOT 0x02
#define CONFIG_HOSTWD_USE_KERN_WD 0x04
#define CONFIG_HOSTWD_CONSOLE_PATH 0x10
#define CONFIG_START_DELAY 0x20
#define CONFIG_HOSTWD_UPDATE_PERIOD 0x40
#define CONFIG_KERNWD_UPDATE_PERIOD 0x80
@ -79,7 +78,6 @@ using namespace std;
CONFIG_HOSTWD_REBOOT |\
CONFIG_HOSTWD_USE_KERN_WD |\
CONFIG_HOSTWD_CONSOLE_PATH |\
CONFIG_START_DELAY |\
CONFIG_HOSTWD_UPDATE_PERIOD |\
CONFIG_KERNWD_UPDATE_PERIOD)