linux-kernel - [PATCH 4/4] drivers: xen: Move prototype declaration to header file include/xen/xen-ops.h from arch/x86/xen/xen-ops.h

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <98aa418fd8664807c4bde1ff7cf2cd5969749129.1391943416.git.rashika.kheria@gmail.com>
Date:	Sun, 9 Feb 2014 16:42:33 +0530
From:	Rashika Kheria <rashika.kheria@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Boris Ostrovsky <boris.ostrovsky@...cle.com>,
	David Vrabel <david.vrabel@...rix.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...hat.com>,
	"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
	Stefano Stabellini <stefano.stabellini@...citrix.com>,
	Wei Liu <wei.liu2@...rix.com>, xen-devel@...ts.xenproject.org,
	josh@...htriplett.org
Subject: [PATCH 4/4] drivers: xen: Move prototype declaration to header file
 include/xen/xen-ops.h from arch/x86/xen/xen-ops.h

Move prototype declaration to header file include/xen/xen-ops.h from
arch/x86/xen/xen-ops.h because it is used by more than one file. Also,
remove else condition from xen/events/events_base.c to eliminate
conflicting definitions when CONFIG_XEN_PVHVM is not defined.

This eliminates the following warning in xen/events/events_base.c:
drivers/xen/events/events_base.c:1640:6: warning: no previous prototype for ‘xen_callback_vector’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@...il.com>
---
 arch/x86/xen/xen-ops.h           |    1 -
 drivers/xen/events/events_base.c |    2 --
 include/xen/xen-ops.h            |    7 +++++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index e5edc7f..aa8a979 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -39,7 +39,6 @@ void xen_enable_sysenter(void);
 void xen_enable_syscall(void);
 void xen_vcpu_restore(void);
 
-void xen_callback_vector(void);
 void xen_hvm_init_shared_info(void);
 void xen_unplug_emulated_devices(void);
 
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 4672e00..5466543 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -1656,8 +1656,6 @@ void xen_callback_vector(void)
 					xen_hvm_callback_vector);
 	}
 }
-#else
-void xen_callback_vector(void) {}
 #endif
 
 #undef MODULE_PARAM_PREFIX
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 9a86337..cdea45b 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -38,4 +38,11 @@ int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,
 bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
 
 irqreturn_t xen_debug_interrupt(int irq, void *dev_id);
+
+#ifdef CONFIG_XEN_PVHVM
+void xen_callback_vector(void);
+#else
+static inline void xen_callback_vector(void) {}
+#endif
+
 #endif /* INCLUDE_XEN_OPS_H */
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/