x86/asm: add .file directives

Make sure local symbols are correctly associated with their source
files: I've just run across a cpufreq.c#create_bounce_frame stack trace
entry. Since we have multiple entry.S, don't use __FILE__ there to
fully disambiguate things.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S
index 72286378238a3b6508284716e838db3c38f04a31..361751d290c3e4a685a10bd52c7bf423fafd42fe 100644 (file)
--- a/xen/arch/x86/acpi/wakeup_prot.S
+++ b/xen/arch/x86/acpi/wakeup_prot.S
@@ -1,3 +1,4 @@
+        .file __FILE__
         .text
 
 #include <xen/multiboot.h>

diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S
index 959c8212bfb374a98cb0fcbe48614dc19d96e650..243a7679c8f4b8dac3d0b9bc39b19cc76b806e43 100644 (file)
--- a/xen/arch/x86/clear_page.S
+++ b/xen/arch/x86/clear_page.S
@@ -1,3 +1,5 @@
+        .file __FILE__
+
 #include <asm/page.h>
 
 #define ptr_reg %rdi

diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S
index f925a39f2c5cc46bb3b8097ab82e747420b814b1..2da81126c5fad1ac4b93f3ce3df23c2b93da4ced 100644 (file)
--- a/xen/arch/x86/copy_page.S
+++ b/xen/arch/x86/copy_page.S
@@ -1,3 +1,5 @@
+        .file __FILE__
+
 #include <asm/page.h>
 
 #define src_reg %rsi

diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S
index a4ab40af2a32cbff6d983c3607fc3e8f7de1e7c9..4a72e38e8b35738a85e94838c77224a4753e5e10 100644 (file)
--- a/xen/arch/x86/hvm/svm/entry.S
+++ b/xen/arch/x86/hvm/svm/entry.S
@@ -17,6 +17,8 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+        .file "svm/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>

diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S
index 9f1755b31c9eff1566a6eeeb7e734e1ebc48921c..53eedc63631c99639c62c65c66739bade7b8dda1 100644 (file)
--- a/xen/arch/x86/hvm/vmx/entry.S
+++ b/xen/arch/x86/hvm/vmx/entry.S
@@ -16,6 +16,8 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+        .file "vmx/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>

diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S
index 217812b44f28c483dae4b2237489e154c2c76b12..6d26192c2cb002eb2dfe14ed9709f975f1d33870 100644 (file)
--- a/xen/arch/x86/pv/gpr_switch.S
+++ b/xen/arch/x86/pv/gpr_switch.S
@@ -5,6 +5,8 @@
  * Copyright (c) 2006, Novell, Inc.
  */
 
+        .file __FILE__
+
 #include <asm/asm_defns.h>
 
 ENTRY(host_to_guest_gpr_switch)

diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index 90bda09614da18a328256af29e4bc80decb0251e..ba6e9418375b4610be55cbfc5a336ee42c5e4f62 100644 (file)
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -2,6 +2,8 @@
  * Compatibility hypercall routines.
  */
 
+        .file "x86_64/compat/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>

diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index b6e2397e845e8f56e383cb39b602e7fdc426a95f..6066ed8b18b4a0f4e10fa109be57222fbc4333c9 100644 (file)
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -4,6 +4,8 @@
  * Copyright (c) 2005, K A Fraser
  */
 
+        .file "x86_64/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>

diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_reloc.S
index 0b1f9a028d0a60e96191dd1e25d0bc85d517f7ac..4d527dbfce8448ed4decd63832ccf0da3428d677 100644 (file)
--- a/xen/arch/x86/x86_64/kexec_reloc.S
+++ b/xen/arch/x86/x86_64/kexec_reloc.S
@@ -10,6 +10,9 @@
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
+
+        .file __FILE__
+
 #include <xen/kimage.h>
 
 #include <asm/asm_defns.h>