diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-01-27 17:56:26 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-01-27 17:56:26 +0200 |
| commit | 22d88e1acee89743969b02a4f79afbbde4ce7e34 (patch) | |
| tree | 2a9b46904d6f830283432ef866e49f987d151cc9 /include/linux | |
| parent | 86caabd611d82b4825d508938b15197041ba5f18 (diff) | |
| parent | d8b4ad87cc6c4e6419815a70cb050b818a4259a2 (diff) | |
Merge tag 'LA.UM.8.4.r1-05000-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998
* tag 'LA.UM.8.4.r1-05000-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
msm: ais: fix camif_cfg programming
ARM: dts: msm: remove CARVEOUT ION for msm8996 ivi multi-gvm vplatform
diag: Update diag logging mask definitions
media: v4l2loopback: fix for dereferenced error
soc: qcom: hab: run the dispatcher's tasklet w/ high priority
Change-Id: I29dc15b5cea65c7bfce5b8ff2202d425165bdc07
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/diagchar.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/diagchar.h b/include/linux/diagchar.h index 1046fb4611bf..d931f9690e2f 100644 --- a/include/linux/diagchar.h +++ b/include/linux/diagchar.h @@ -145,10 +145,10 @@ the appropriate macros. */ /* This needs to be modified manually now, when we add a new RANGE of SSIDs to the msg_mask_tbl */ #define MSG_MASK_TBL_CNT 26 -#define APPS_EVENT_LAST_ID 0xCB4 +#define APPS_EVENT_LAST_ID 0xCB7 #define MSG_SSID_0 0 -#define MSG_SSID_0_LAST 130 +#define MSG_SSID_0_LAST 131 #define MSG_SSID_1 500 #define MSG_SSID_1_LAST 506 #define MSG_SSID_2 1000 @@ -341,13 +341,15 @@ static const uint32_t msg_bld_masks_0[] = { MSG_LVL_MED, MSG_LVL_HIGH, MSG_LVL_LOW, - MSG_LVL_LOW|MSG_LVL_MED|MSG_LVL_HIGH|MSG_LVL_ERROR|MSG_LVL_FATAL, + MSG_LVL_LOW | MSG_LVL_MED | MSG_LVL_HIGH | MSG_LVL_ERROR | + MSG_LVL_FATAL, MSG_LVL_HIGH, MSG_LVL_LOW, MSG_LVL_MED, MSG_LVL_MED, MSG_LVL_HIGH, - MSG_LVL_HIGH + MSG_LVL_HIGH, + MSG_LVL_LOW | MSG_LVL_MED | MSG_LVL_HIGH | MSG_LVL_ERROR }; static const uint32_t msg_bld_masks_1[] = { @@ -911,7 +913,7 @@ static const uint32_t msg_bld_masks_25[] = { /* LOG CODES */ static const uint32_t log_code_last_tbl[] = { 0x0, /* EQUIP ID 0 */ - 0x1CB2, /* EQUIP ID 1 */ + 0x1CC0, /* EQUIP ID 1 */ 0x0, /* EQUIP ID 2 */ 0x0, /* EQUIP ID 3 */ 0x4910, /* EQUIP ID 4 */ |