diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-24 08:47:23 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-24 08:47:23 +0000 |
| commit | 0c4ff0fb92533aff947945f3562221a83bbfb941 (patch) | |
| tree | 6c87342b77718bc05e02e23841051c8aa01d6abe /xen/include/asm-x86/x86_64 | |
| parent | abf60d361232f53ad3c51fab74ff3b6f084d7f8e (diff) | |
| download | xen-0c4ff0fb92533aff947945f3562221a83bbfb941.tar.gz xen-0c4ff0fb92533aff947945f3562221a83bbfb941.tar.bz2 xen-0c4ff0fb92533aff947945f3562221a83bbfb941.zip | |
x86-64: use PC-relative exception table entries
... thus allowing to make the entries half their current size. Rather
than adjusting all instances to the new layout, abstract the
construction the table entries via a macro (paralleling a similar one
in recent Linux).
Also change the name of the section (to allow easier detection of
missed cases) and merge the final resulting output sections into
.data.read_mostly.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/include/asm-x86/x86_64')
| -rw-r--r-- | xen/include/asm-x86/x86_64/asm_defns.h | 6 | ||||
| -rw-r--r-- | xen/include/asm-x86/x86_64/system.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/xen/include/asm-x86/x86_64/asm_defns.h b/xen/include/asm-x86/x86_64/asm_defns.h index a56ac63211..24620bae4f 100644 --- a/xen/include/asm-x86/x86_64/asm_defns.h +++ b/xen/include/asm-x86/x86_64/asm_defns.h @@ -130,4 +130,10 @@ STR(IRQ) #nr "_interrupt:\n\t" \ GET_CPUINFO_FIELD(CPUINFO_current_vcpu,reg) \ movq (reg),reg; +#ifdef __ASSEMBLY__ +# define _ASM_EX(p) p-. +#else +# define _ASM_EX(p) #p "-." +#endif + #endif /* __X86_64_ASM_DEFNS_H__ */ diff --git a/xen/include/asm-x86/x86_64/system.h b/xen/include/asm-x86/x86_64/system.h index 4f183c0535..20f038bf94 100644 --- a/xen/include/asm-x86/x86_64/system.h +++ b/xen/include/asm-x86/x86_64/system.h @@ -19,10 +19,7 @@ "3: movl $1,%1\n" \ " jmp 2b\n" \ ".previous\n" \ - ".section __ex_table,\"a\"\n" \ - " .align 8\n" \ - " .quad 1b,3b\n" \ - ".previous" \ + _ASM_EXTABLE(1b, 3b) \ : "=a" (_o), "=r" (_rc) \ : _regtype (_n), "m" (*__xg((volatile void *)_p)), "0" (_o), "1" (0) \ : "memory"); |