diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-02 18:23:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-02 18:23:08 -0400 |
| commit | 59117d3f4e3f5a7980353d2f476e516c758ce921 (patch) | |
| tree | dbc12a55f0e1c46205acbc88bda35b96ad4b1269 | |
| parent | 856fc004b82ae31846b3037558ec1b2a6286e629 (diff) | |
| parent | 8cc574a3c5cea70229f243a6b57fd69e60491d82 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
[SPARC]: Add unsigned to unused bit field in a.out.h
| -rw-r--r-- | drivers/scsi/scsi_error.c | 2 | ||||
| -rw-r--r-- | include/asm-sparc/a.out.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/a.out.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index b8edcf5b5451..918bb6019540 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -716,7 +716,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, | |||
| 716 | */ | 716 | */ |
| 717 | if (copy_sense) { | 717 | if (copy_sense) { |
| 718 | if (!SCSI_SENSE_VALID(scmd)) { | 718 | if (!SCSI_SENSE_VALID(scmd)) { |
| 719 | memcpy(scmd->sense_buffer, scmd->request_buffer, | 719 | memcpy(scmd->sense_buffer, page_address(sgl.page), |
| 720 | sizeof(scmd->sense_buffer)); | 720 | sizeof(scmd->sense_buffer)); |
| 721 | } | 721 | } |
| 722 | __free_page(sgl.page); | 722 | __free_page(sgl.page); |
diff --git a/include/asm-sparc/a.out.h b/include/asm-sparc/a.out.h index e4e83eb0161e..9090060a23e6 100644 --- a/include/asm-sparc/a.out.h +++ b/include/asm-sparc/a.out.h | |||
| @@ -80,7 +80,7 @@ struct relocation_info /* used when header.a_machtype == M_SPARC */ | |||
| 80 | unsigned long r_address; /* relocation addr */ | 80 | unsigned long r_address; /* relocation addr */ |
| 81 | unsigned int r_index:24; /* segment index or symbol index */ | 81 | unsigned int r_index:24; /* segment index or symbol index */ |
| 82 | unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ | 82 | unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ |
| 83 | int r_pad:2; /* <unused> */ | 83 | unsigned int r_pad:2; /* <unused> */ |
| 84 | enum reloc_type r_type:5; /* type of relocation to perform */ | 84 | enum reloc_type r_type:5; /* type of relocation to perform */ |
| 85 | long r_addend; /* addend for relocation value */ | 85 | long r_addend; /* addend for relocation value */ |
| 86 | }; | 86 | }; |
diff --git a/include/asm-sparc64/a.out.h b/include/asm-sparc64/a.out.h index 35cb5c9e0c92..eb3b8e90b279 100644 --- a/include/asm-sparc64/a.out.h +++ b/include/asm-sparc64/a.out.h | |||
| @@ -86,7 +86,7 @@ struct relocation_info /* used when header.a_machtype == M_SPARC */ | |||
| 86 | unsigned int r_address; /* relocation addr */ | 86 | unsigned int r_address; /* relocation addr */ |
| 87 | unsigned int r_index:24; /* segment index or symbol index */ | 87 | unsigned int r_index:24; /* segment index or symbol index */ |
| 88 | unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ | 88 | unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ |
| 89 | int r_pad:2; /* <unused> */ | 89 | unsigned int r_pad:2; /* <unused> */ |
| 90 | enum reloc_type r_type:5; /* type of relocation to perform */ | 90 | enum reloc_type r_type:5; /* type of relocation to perform */ |
| 91 | int r_addend; /* addend for relocation value */ | 91 | int r_addend; /* addend for relocation value */ |
| 92 | }; | 92 | }; |