Skip to content

Commit

Permalink
x86: clean up arch/x86/ia32/syscall32.c
Browse files Browse the repository at this point in the history
White space and coding style clenaup.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Thomas Gleixner authored and Ingo Molnar committed Jan 30, 2008
1 parent c202f29 commit 6ec8756
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions arch/x86/ia32/syscall32.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Copyright 2002,2003 Andi Kleen, SuSE Labs */

/* vsyscall handling for 32bit processes. Map a stub page into it
on demand because 32bit cannot reach the kernel's fixmaps */

/*
* Copyright 2002,2003 Andi Kleen, SuSE Labs
*
* vsyscall handling for 32bit processes. Map a stub page into it on
* demand because 32bit cannot reach the kernel's fixmaps
*/
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/kernel.h>
Expand Down Expand Up @@ -50,31 +51,33 @@ int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
}

static int __init init_syscall32(void)
{
{
char *syscall32_page = (void *)get_zeroed_page(GFP_KERNEL);
if (!syscall32_page)
panic("Cannot allocate syscall32 page");

if (!syscall32_page)
panic("Cannot allocate syscall32 page");
syscall32_pages[0] = virt_to_page(syscall32_page);
if (use_sysenter > 0) {
memcpy(syscall32_page, syscall32_sysenter,
syscall32_sysenter_end - syscall32_sysenter);
} else {
memcpy(syscall32_page, syscall32_syscall,
syscall32_syscall_end - syscall32_syscall);
}
if (use_sysenter > 0) {
memcpy(syscall32_page, syscall32_sysenter,
syscall32_sysenter_end - syscall32_sysenter);
} else {
memcpy(syscall32_page, syscall32_syscall,
syscall32_syscall_end - syscall32_syscall);
}
return 0;
}

__initcall(init_syscall32);
}
__initcall(init_syscall32);

/* May not be __init: called during resume */
void syscall32_cpu_init(void)
{
if (use_sysenter < 0)
use_sysenter = (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL);
use_sysenter = (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL);

/* Load these always in case some future AMD CPU supports
SYSENTER from compat mode too. */
/*
* Load these always in case some future AMD CPU supports
* SYSENTER from compat mode too.
*/
checking_wrmsrl(MSR_IA32_SYSENTER_CS, (u64)__KERNEL_CS);
checking_wrmsrl(MSR_IA32_SYSENTER_ESP, 0ULL);
checking_wrmsrl(MSR_IA32_SYSENTER_EIP, (u64)ia32_sysenter_target);
Expand Down

0 comments on commit 6ec8756

Please sign in to comment.