Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
375d1ade
Commit
375d1ade
authored
Aug 13, 2021
by
Paolo Bonzini
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'kvm-vmx-secctl' into kvm-master
Merge common topic branch for 5.14-rc6 and 5.15 merge window.
parents
ffbe17ca
7b9cae02
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
arch/x86/kvm/vmx/vmx.h
arch/x86/kvm/vmx/vmx.h
+1
-1
No files found.
arch/x86/kvm/vmx/vmx.h
View file @
375d1ade
...
...
@@ -522,7 +522,7 @@ static inline struct vmcs *alloc_vmcs(bool shadow)
static
inline
bool
vmx_has_waitpkg
(
struct
vcpu_vmx
*
vmx
)
{
return
vmx
->
secondary_exec_control
&
return
secondary_exec_controls_get
(
vmx
)
&
SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment