Xen project Mailing List

[Xen-changelog] [xen master] xen: Drop asmlinkage everywhere

Date: Sat, 09 Sep 2017 17:13:03 +0000

Delivery-date: Sat, 09 Sep 2017 17:13:07 +0000

List-id: "Change log for Mercurial \(receive only\)" <xen-changelog.lists.xen.org>

commit 12257de3cfff9b4ffa0b7379ef82c9ad7c8dbec9 Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> AuthorDate: Fri Sep 1 17:05:21 2017 +0000 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Wed Sep 6 11:00:14 2017 +0100 xen: Drop asmlinkage everywhere asmlinkage is defined as nothing on all architectures, and not used consistently anywhere, even in common code. Remove it all. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Acked-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> --- xen/arch/arm/arm32/traps.c | 8 ++++---- xen/arch/arm/arm64/traps.c | 2 +- xen/arch/arm/traps.c | 16 ++++++++-------- xen/common/softirq.c | 2 +- xen/include/acpi/acpixf.h | 4 ++-- xen/include/asm-arm/config.h | 2 -- xen/include/asm-x86/config.h | 2 -- xen/include/xen/softirq.h | 2 +- 8 files changed, 17 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index c24fc14..7052558 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -23,7 +23,7 @@ #include <asm/processor.h> -asmlinkage void do_trap_undefined_instruction(struct cpu_user_regs *regs) +void do_trap_undefined_instruction(struct cpu_user_regs *regs) { uint32_t pc = regs->pc; uint32_t instr; @@ -50,17 +50,17 @@ die: do_unexpected_trap("Undefined Instruction", regs); } -asmlinkage void do_trap_hypervisor_call(struct cpu_user_regs *regs) +void do_trap_hypervisor_call(struct cpu_user_regs *regs) { do_unexpected_trap("Hypervisor Call", regs); } -asmlinkage void do_trap_prefetch_abort(struct cpu_user_regs *regs) +void do_trap_prefetch_abort(struct cpu_user_regs *regs) { do_unexpected_trap("Prefetch Abort", regs); } -asmlinkage void do_trap_data_abort(struct cpu_user_regs *regs) +void do_trap_data_abort(struct cpu_user_regs *regs) { /* * We cannot distinguish Xen SErrors from synchronous data aborts. We diff --git a/xen/arch/arm/arm64/traps.c b/xen/arch/arm/arm64/traps.c index 36b3a30..38470a1 100644 --- a/xen/arch/arm/arm64/traps.c +++ b/xen/arch/arm/arm64/traps.c @@ -30,7 +30,7 @@ static const char *handler[]= { "Error" }; -asmlinkage void do_bad_mode(struct cpu_user_regs *regs, int reason) +void do_bad_mode(struct cpu_user_regs *regs, int reason) { union hsr hsr = { .bits = regs->hsr }; diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index aa838e8..7f6ec15 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -185,7 +185,7 @@ void init_traps(void) isb(); } -asmlinkage void __div0(void) +void __div0(void) { printk("Division by zero in hypervisor.\n"); BUG(); @@ -2824,7 +2824,7 @@ static void enter_hypervisor_head(struct cpu_user_regs *regs) } } -asmlinkage void do_trap_guest_sync(struct cpu_user_regs *regs) +void do_trap_guest_sync(struct cpu_user_regs *regs) { const union hsr hsr = { .bits = regs->hsr }; @@ -2952,7 +2952,7 @@ asmlinkage void do_trap_guest_sync(struct cpu_user_regs *regs) } } -asmlinkage void do_trap_hyp_sync(struct cpu_user_regs *regs) +void do_trap_hyp_sync(struct cpu_user_regs *regs) { const union hsr hsr = { .bits = regs->hsr }; @@ -2973,33 +2973,33 @@ asmlinkage void do_trap_hyp_sync(struct cpu_user_regs *regs) } } -asmlinkage void do_trap_hyp_serror(struct cpu_user_regs *regs) +void do_trap_hyp_serror(struct cpu_user_regs *regs) { enter_hypervisor_head(regs); __do_trap_serror(regs, VABORT_GEN_BY_GUEST(regs)); } -asmlinkage void do_trap_guest_serror(struct cpu_user_regs *regs) +void do_trap_guest_serror(struct cpu_user_regs *regs) { enter_hypervisor_head(regs); __do_trap_serror(regs, true); } -asmlinkage void do_trap_irq(struct cpu_user_regs *regs) +void do_trap_irq(struct cpu_user_regs *regs) { enter_hypervisor_head(regs); gic_interrupt(regs, 0); } -asmlinkage void do_trap_fiq(struct cpu_user_regs *regs) +void do_trap_fiq(struct cpu_user_regs *regs) { enter_hypervisor_head(regs); gic_interrupt(regs, 1); } -asmlinkage void leave_hypervisor_tail(void) +void leave_hypervisor_tail(void) { while (1) { diff --git a/xen/common/softirq.c b/xen/common/softirq.c index ac12cf8..83c3c09 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -58,7 +58,7 @@ void process_pending_softirqs(void) __do_softirq(1ul<<SCHEDULE_SOFTIRQ); } -asmlinkage void do_softirq(void) +void do_softirq(void) { ASSERT_NOT_IN_ATOMIC(); __do_softirq(0); diff --git a/xen/include/acpi/acpixf.h b/xen/include/acpi/acpixf.h index 7ae1f07..ba74908 100644 --- a/xen/include/acpi/acpixf.h +++ b/xen/include/acpi/acpixf.h @@ -117,9 +117,9 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * slp_typ_a, u8 * slp_typ_b); acpi_status acpi_enter_sleep_state_prep(u8 sleep_state); -acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state); +acpi_status acpi_enter_sleep_state(u8 sleep_state); -acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void); +acpi_status acpi_enter_sleep_state_s4bios(void); acpi_status acpi_leave_sleep_state_prep(u8 sleep_state); diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 210c9f8..45f472f 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -48,8 +48,6 @@ #define INVALID_VCPU_ID MAX_VIRT_CPUS -#define asmlinkage /* Nothing needed */ - #define __LINUX_ARM_ARCH__ 7 #define CONFIG_AEABI diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index f63a9cb..9ef9d03 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -105,8 +105,6 @@ extern unsigned short boot_edid_caps; extern unsigned char boot_edid_info[128]; #endif -#define asmlinkage - #include <xen/const.h> #define PML4_ENTRY_BITS 39 diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 0895a16..c327c9b 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -22,7 +22,7 @@ enum { typedef void (*softirq_handler)(void); -asmlinkage void do_softirq(void); +void do_softirq(void); void open_softirq(int nr, softirq_handler handler); void softirq_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.