This fixes some mangled whitespace added by the earlier trap_user.c patch.

Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>

Index: linux-2.6.15/arch/um/os-Linux/skas/trap.c
===================================================================
--- linux-2.6.15.orig/arch/um/os-Linux/skas/trap.c      2006-01-05 
16:20:31.000000000 -0500
+++ linux-2.6.15/arch/um/os-Linux/skas/trap.c   2006-01-05 17:07:57.000000000 
-0500
@@ -34,11 +34,11 @@ void sig_handler_common_skas(int sig, vo
        r = &TASK_REGS(get_current())->skas;
        save_user = r->is_user;
        r->is_user = 0;
-        if ( sig == SIGFPE || sig == SIGSEGV ||
-             sig == SIGBUS || sig == SIGILL ||
-             sig == SIGTRAP ) {
-                GET_FAULTINFO_FROM_SC(r->faultinfo, sc);
-        }
+       if ( sig == SIGFPE || sig == SIGSEGV ||
+            sig == SIGBUS || sig == SIGILL ||
+            sig == SIGTRAP ) {
+               GET_FAULTINFO_FROM_SC(r->faultinfo, sc);
+       }
 
        change_sig(SIGUSR1, 1);
 
@@ -60,8 +60,8 @@ extern int ptrace_faultinfo;
 void user_signal(int sig, union uml_pt_regs *regs, int pid)
 {
        void (*handler)(int, union uml_pt_regs *);
-        int segv = ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) ||
-                    (sig == SIGILL) || (sig == SIGTRAP));
+       int segv = ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) ||
+                   (sig == SIGILL) || (sig == SIGTRAP));
 
        if (segv)
                get_skas_faultinfo(pid, &regs->skas.faultinfo);



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Reply via email to