[RHEL7,COMMIT] x86/mm/kaiser: Fix build with CONFIG_XEN=n

Submitted by Konstantin Khorenko on Oct. 8, 2018, 4:13 p.m.

Details

Message ID 201810081613.w98GDDS4017995@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Oct. 8, 2018, 4:13 p.m.
The commit is pushed to "branch-rh7-3.10.0-862.14.4.vz7.72.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.14.4.vz7.72.4
------>
commit e616d7fa05d428ab5c2eeff250387961118dd50a
Author: Andrey Ryabinin <aryabinin@virtuozzo.com>
Date:   Mon Oct 8 19:13:12 2018 +0300

    x86/mm/kaiser: Fix build with CONFIG_XEN=n
    
    Fix the following:
    arch/x86/mm/kaiser.c: In function ‘create_kpti_enabled’:
    arch/x86/mm/kaiser.c:623:7: error: implicit declaration of function ‘xen_pv_domain’; did you mean ‘is_xen_pv_domain’? [-Werror=implicit-function-declaration]
      if (!xen_pv_domain())
           ^~~~~~~~~~~~~
           is_xen_pv_domain
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1637114
    
    Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 arch/x86/mm/kaiser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
index 5996f64b9b75..c4f6044eb57b 100644
--- a/arch/x86/mm/kaiser.c
+++ b/arch/x86/mm/kaiser.c
@@ -620,7 +620,7 @@  static const struct file_operations fops_kaiser_enabled = {
 
 static int __init create_kpti_enabled(void)
 {
-	if (!xen_pv_domain())
+	if (!is_xen_pv_domain())
 		debugfs_create_file("pti_enabled", S_IRUSR | S_IWUSR,
 				    arch_debugfs_dir, NULL, &fops_kaiser_enabled);
 	return 0;