From a328216c975d3d421b1a41b1ea7d5769170ca870 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 30 Jan 2008 13:31:16 +0100 Subject: [PATCH] --- yaml --- r: 79984 b: refs/heads/master c: 6b7d190b14d478c759be22dcb7ee4695a711b562 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/sleep_32.c | 2 +- trunk/arch/x86/kernel/vm86_32.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ce1e47165a2a..42ed45ef1937 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 332540d5fe7f3370bb860090e4b906340a2e2afb +refs/heads/master: 6b7d190b14d478c759be22dcb7ee4695a711b562 diff --git a/trunk/arch/x86/kernel/acpi/sleep_32.c b/trunk/arch/x86/kernel/acpi/sleep_32.c index 10699489cfe7..09f820d920b1 100644 --- a/trunk/arch/x86/kernel/acpi/sleep_32.c +++ b/trunk/arch/x86/kernel/acpi/sleep_32.c @@ -17,7 +17,7 @@ unsigned long acpi_wakeup_address = 0; unsigned long acpi_realmode_flags; extern char wakeup_start, wakeup_end; -extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long)); +extern unsigned long acpi_copy_wakeup_routine(unsigned long); /** * acpi_save_state_mem - save kernel state diff --git a/trunk/arch/x86/kernel/vm86_32.c b/trunk/arch/x86/kernel/vm86_32.c index e85bb44265cb..5aa5e2f9f0ad 100644 --- a/trunk/arch/x86/kernel/vm86_32.c +++ b/trunk/arch/x86/kernel/vm86_32.c @@ -120,7 +120,7 @@ static int copy_vm86_regs_from_user(struct kernel_vm86_regs *regs, return ret; } -struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs)); +struct pt_regs * save_v86_state(struct kernel_vm86_regs * regs); struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs) { struct tss_struct *tss;