Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59117d3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 856fc004 8cc574a3

drivers/scsi/scsi_error.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, 
	 */

	if (copy_sense) {

		if (!SCSI_SENSE_VALID(scmd)) {

			memcpy(scmd->sense_buffer, scmd->request_buffer,

			memcpy(scmd->sense_buffer, page_address(sgl.page),

			       sizeof(scmd->sense_buffer));

		}

		__free_page(sgl.page);

include/asm-sparc/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct relocation_info /* used when header.a_machtype == M_SPARC */ 
        unsigned long   r_address;  /* relocation addr */

        unsigned int    r_index:24; /* segment index or symbol index */

        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 */

        long            r_addend;   /* addend for relocation value */

};

include/asm-sparc64/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct relocation_info /* used when header.a_machtype == M_SPARC */ 
        unsigned int    r_address;  /* relocation addr */

        unsigned int    r_index:24; /* segment index or symbol index */

        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 */

        int             r_addend;   /* addend for relocation value */

};