mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: guorke <gourke@gmail.com>
To: linux-kernel@vger.kernel.org
Subject: I confused about diff(simple question)
Date: Sun, 10 Jul 2005 13:41:40 +0800	[thread overview]
Message-ID: <d73ab4d005070922413fb0dbba@mail.gmail.com> (raw)

like:

 /*
@@ -220,9 +232,8(HERE: why not -220,9 +220,8) @@ fastcall notrace void
do_page_fault(stru
       struct vm_area_struct * vma;
       unsigned long address;
       unsigned long page;
-       int write;
-       siginfo_t info;
-
+       int write, si_code;
+
       /* get the address */
       __asm__("movl %%cr2,%0":"=r" (address));
       trace_special(regs->eip, error_code, address);
@@ -236,7 +247,7 (HERE: why not -236,7,+236,7) @@ fastcall notrace
void do_page_fault(stru

       tsk = current;

-       info.si_code = SEGV_MAPERR;
+       si_code = SEGV_MAPERR;

       /*
        * We fault-in kernel-space virtual memory on-demand. The
@@ -316,7 +327,7 (HERE -316,7, +316,7) @@ fastcall notrace void
do_page_fault(stru
 * we can handle it..
 */
 good_area:
-       info.si_code = SEGV_ACCERR;
+       si_code = SEGV_ACCERR;
       write = 0;
       switch (error_code & 3) {
               default:        /* 3: write, present */
@@ -390,11 +401,7 (HERE:why not -390,11,+390,11) @@ bad_area_nosemaphore:
               /* Kernel addresses are always protection faults */
               tsk->thread.error_code = error_code | (address >= TASK_SIZE);
               tsk->thread.trap_no = 14;
-               info.si_signo = SIGSEGV;
-               info.si_errno = 0;
-               /* info.si_code has been set above */
-               info.si_addr = (void __user *)address;
-               force_sig_info(SIGSEGV, &info, tsk);
+               force_sig_info_fault(SIGSEGV, si_code, address, tsk);
               return;
       }

@@ -500,11 +507,7(HERE: why not -500,11,+500,7) @@ do_sigbus:
       tsk->thread.cr2 = address;
       tsk->thread.error_code = error_code;
       tsk->thread.trap_no = 14;
-       info.si_signo = SIGBUS;
-       info.si_errno = 0;
-       info.si_code = BUS_ADRERR;
-       info.si_addr = (void __user *)address;
-       force_sig_info(SIGBUS, &info, tsk);
+       force_sig_info_fault(SIGBUS, BUS_ADRERR, address, tsk);
       return;

...

in :-220,9 +232,8
 I think the old file from the line 220,and have 9 lines,then the
newfile have 8 lines
so must delete one line. but why +232,it from the line 232 ?
like this..

maybe it's very very simple.but i really confused it.wishes helps,

Thanks

--------
guorke

             reply	other threads:[~2005-07-10  5:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-10  5:41 guorke [this message]
2005-07-10  5:42 ` guorke
2005-07-10  6:11 ` Willy Tarreau
2005-07-10  6:13 ` randy_dunlap

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=d73ab4d005070922413fb0dbba@mail.gmail.com \
    --to=gourke@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®