From: "Gustavo F. Padovan" <gustavo@las.ic.unicamp.br>
To: linux-kernel@vger.kernel.org
Cc: mingo@elte.hu
Subject: [PATCH 18/24] x86: kernel/signal_64.c cleanup
Date: Mon, 28 Jul 2008 18:09:25 -0300 [thread overview]
Message-ID: <1217279371-4410-19-git-send-email-gustavo@las.ic.unicamp.br> (raw)
In-Reply-To: <1217279371-4410-18-git-send-email-gustavo@las.ic.unicamp.br>
Remove additional whitespaces and tabs.
Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
---
arch/x86/kernel/signal_64.c | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index b45ef8d..4b7e082 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -42,9 +42,9 @@
#endif
int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs * regs);
+ sigset_t *set, struct pt_regs * regs);
int ia32_setup_frame(int sig, struct k_sigaction *ka,
- sigset_t *set, struct pt_regs * regs);
+ sigset_t *set, struct pt_regs * regs);
asmlinkage long
sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
@@ -189,7 +189,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
current->blocked = set;
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
-
+
if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
goto badframe;
@@ -201,7 +201,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
badframe:
signal_fault(regs,frame,"sigreturn");
return 0;
-}
+}
/*
* Set up a signal frame.
@@ -267,32 +267,32 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs * regs)
{
struct rt_sigframe __user *frame;
- struct _fpstate __user *fp = NULL;
+ struct _fpstate __user *fp = NULL;
int err = 0;
struct task_struct *me = current;
if (used_math()) {
- fp = get_stack(ka, regs, sizeof(struct _fpstate));
+ fp = get_stack(ka, regs, sizeof(struct _fpstate));
frame = (void __user *)round_down(
(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;
if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))
goto give_sigsegv;
- if (save_i387(fp) < 0)
- err |= -1;
+ if (save_i387(fp) < 0)
+ err |= -1;
} else
frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
- if (ka->sa.sa_flags & SA_SIGINFO) {
+ if (ka->sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, info);
if (err)
goto give_sigsegv;
}
-
+
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags);
err |= __put_user(0, &frame->uc.uc_link);
@@ -302,9 +302,9 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
err |= __put_user(fp, &frame->uc.uc_mcontext.fpstate);
- if (sizeof(*set) == 16) {
+ if (sizeof(*set) == 16) {
__put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
- __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
+ __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
} else
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
@@ -315,7 +315,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
} else {
/* could use a vstub here */
- goto give_sigsegv;
+ goto give_sigsegv;
}
if (err)
@@ -323,7 +323,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
/* Set up registers for signal handler */
regs->di = sig;
- /* In case the signal handler was declared without prototypes */
+ /* In case the signal handler was declared without prototypes */
regs->ax = 0;
/* This also works for non SA_SIGINFO handlers because they expect the
@@ -376,7 +376,7 @@ static long current_syscall_ret(struct pt_regs *regs)
/*
* OK, we're invoking a handler
- */
+ */
static int
handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
@@ -420,7 +420,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
ret = ia32_setup_rt_frame(sig, ka, info, oldset, regs);
else
ret = ia32_setup_frame(sig, ka, oldset, regs);
- } else
+ } else
#endif
ret = setup_rt_frame(sig, ka, info, oldset, regs);
@@ -552,8 +552,8 @@ void do_notify_resume(struct pt_regs *regs, void *unused,
}
void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
-{
- struct task_struct *me = current;
+{
+ struct task_struct *me = current;
if (show_unhandled_signals && printk_ratelimit()) {
printk("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",
me->comm,me->pid,where,frame,regs->ip,regs->sp,regs->orig_ax);
@@ -561,5 +561,5 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
printk("\n");
}
- force_sig(SIGSEGV, me);
-}
+ force_sig(SIGSEGV, me);
+}
--
1.5.4.5
next prev parent reply other threads:[~2008-07-28 21:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 21:09 [PATCH 0/24] x86: arch/x86/kernel/ cleanups Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 01/24] x86: kernel/alternative.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 02/24] x86: kernel/apm_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 03/24] x86: kernel/asm-offsets_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 04/24] x86: kernel/efi.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 05/24] x86: kernel/cpuid.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 06/24] x86: kernel/early-quirks.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 07/24] x86: kernel/io_apic_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 08/24] x86: kernel/io_apic_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 09/24] x86: kernel/irq_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 10/24] x86: kernel/irqinit_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 11/24] x86: kernel/kprobes.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 12/24] x86: kernel/microcode.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 13/24] x86: kernel/module_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 14/24] x86: kernel/pci-calgary_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 15/24] x86: kernel/probe_roms_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 16/24] x86: kernel/process_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 17/24] x86: kernel/process_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` Gustavo F. Padovan [this message]
2008-07-28 21:09 ` [PATCH 19/24] x86: kernel/traps_64.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 20/24] x86: kernel/tsc.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 21/24] x86: kernel/visws_quirks.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 22/24] x86: kernel/vmi_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 23/24] x86: kernel/vmiclock_32.c cleanup Gustavo F. Padovan
2008-07-28 21:09 ` [PATCH 24/24] x86: kernel/sys_x86_64.c cleanup Gustavo F. Padovan
2008-07-29 1:47 ` [PATCH 11/24] x86: kernel/kprobes.c cleanup Masami Hiramatsu
2008-08-07 9:47 ` [PATCH 02/24] x86: kernel/apm_32.c cleanup Robert Richter
2008-07-28 21:17 ` [PATCH 0/24] x86: arch/x86/kernel/ cleanups Jeremy Fitzhardinge
2008-07-28 21:20 ` Ingo Molnar
2008-07-28 21:37 ` Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1217279371-4410-19-git-send-email-gustavo@las.ic.unicamp.br \
--to=gustavo@las.ic.unicamp.br \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).