[xen master] x86/nmi: avoid UB for P4-era watchdogs

[patchbot@xxxxxxx]

commit bebb49125fd305ae7814d7d4fcc05a85cc2a21e0
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Nov 20 08:28:11 2020 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Nov 20 08:28:11 2020 +0100

    x86/nmi: avoid UB for P4-era watchdogs
    
    Found by looking for patterns similar to the one Julien did spot in
    pci_vtd_quirks().
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/nmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 014524486f..ab94a96c4d 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -132,7 +132,7 @@ int nmi_active;
 #define P4_ESCR_EVENT_SELECT(N)        ((N)<<25)
 #define P4_CCCR_OVF_PMI0       (1<<26)
 #define P4_CCCR_OVF_PMI1       (1<<27)
-#define P4_CCCR_OVF            (1<<31)
+#define P4_CCCR_OVF            (1u << 31)
 #define P4_CCCR_THRESHOLD(N)   ((N)<<20)
 #define P4_CCCR_COMPLEMENT     (1<<19)
 #define P4_CCCR_COMPARE                (1<<18)
--
generated by git-patchbot for /home/xen/git/xen.git#master