lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2007-04-02 15:23:08 -07:00
parent 856fc004b8 8cc574a3c5
commit 59117d3f4e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/scsi_error.c
View File

@@ -716,7 +716,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
*/ */
if (copy_sense) { if (copy_sense) {
if (!SCSI_SENSE_VALID(scmd)) { if (!SCSI_SENSE_VALID(scmd)) {
memcpy(scmd->sense_buffer, scmd->request_buffer, memcpy(scmd->sense_buffer, page_address(sgl.page),
sizeof(scmd->sense_buffer)); sizeof(scmd->sense_buffer));
} }
__free_page(sgl.page); __free_page(sgl.page);

2
include/asm-sparc/a.out.h
View File

@@ -80,7 +80,7 @@ struct relocation_info /* used when header.a_machtype == M_SPARC */
unsigned long r_address; /* relocation addr */ unsigned long r_address; /* relocation addr */
unsigned int r_index:24; /* segment index or symbol index */ unsigned int r_index:24; /* segment index or symbol index */
unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */
int r_pad:2; /* <unused> */ unsigned int r_pad:2; /* <unused> */
enum reloc_type r_type:5; /* type of relocation to perform */ enum reloc_type r_type:5; /* type of relocation to perform */
long r_addend; /* addend for relocation value */ long r_addend; /* addend for relocation value */
}; };

2
include/asm-sparc64/a.out.h
View File

@@ -86,7 +86,7 @@ struct relocation_info /* used when header.a_machtype == M_SPARC */
unsigned int r_address; /* relocation addr */ unsigned int r_address; /* relocation addr */
unsigned int r_index:24; /* segment index or symbol index */ unsigned int r_index:24; /* segment index or symbol index */
unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */
int r_pad:2; /* <unused> */ unsigned int r_pad:2; /* <unused> */
enum reloc_type r_type:5; /* type of relocation to perform */ enum reloc_type r_type:5; /* type of relocation to perform */
int r_addend; /* addend for relocation value */ int r_addend; /* addend for relocation value */
}; };