tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] aic byteorder fixes after recent cleanup

Rebuild the aic7xxx firmware doesn't work anymore after this change
which appeared int 2.6.13-rc1:

[SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft

Two files did not include byteorder.h, resulting in aic dying with a panic

"Unknown opcode encountered in seq program"

This fixes it for me.

Signed-off-by: Olaf Hering <olh@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Olaf Hering and committed by Linus Torvalds f7c80c9f f7d1d23c

+7 -5
unified split
+2 -2
drivers/scsi/aic7xxx/aicasm/aicasm.c
··· 369 370 fprintf(ofile, "%s\t0x%02x, 0x%02x, 0x%02x, 0x%02x", 371 cur_instr == STAILQ_FIRST(&seq_program) ? "" : ",\n", 372 - #if BYTE_ORDER == LITTLE_ENDIAN 373 cur_instr->format.bytes[0], 374 cur_instr->format.bytes[1], 375 cur_instr->format.bytes[2], ··· 613 line++; 614 } 615 fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr, 616 - #if BYTE_ORDER == LITTLE_ENDIAN 617 cur_instr->format.bytes[0], 618 cur_instr->format.bytes[1], 619 cur_instr->format.bytes[2],
··· 369 370 fprintf(ofile, "%s\t0x%02x, 0x%02x, 0x%02x, 0x%02x", 371 cur_instr == STAILQ_FIRST(&seq_program) ? "" : ",\n", 372 + #ifdef __LITTLE_ENDIAN 373 cur_instr->format.bytes[0], 374 cur_instr->format.bytes[1], 375 cur_instr->format.bytes[2], ··· 613 line++; 614 } 615 fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr, 616 + #ifdef __LITTLE_ENDIAN 617 cur_instr->format.bytes[0], 618 cur_instr->format.bytes[1], 619 cur_instr->format.bytes[2],
+5 -3
drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
··· 42 * $FreeBSD$ 43 */ 44 45 struct ins_format1 { 46 - #if BYTE_ORDER == LITTLE_ENDIAN 47 uint32_t immediate : 8, 48 source : 9, 49 destination : 9, ··· 63 }; 64 65 struct ins_format2 { 66 - #if BYTE_ORDER == LITTLE_ENDIAN 67 uint32_t shift_control : 8, 68 source : 9, 69 destination : 9, ··· 81 }; 82 83 struct ins_format3 { 84 - #if BYTE_ORDER == LITTLE_ENDIAN 85 uint32_t immediate : 8, 86 source : 9, 87 address : 10,
··· 42 * $FreeBSD$ 43 */ 44 45 + #include <asm/byteorder.h> 46 + 47 struct ins_format1 { 48 + #ifdef __LITTLE_ENDIAN 49 uint32_t immediate : 8, 50 source : 9, 51 destination : 9, ··· 61 }; 62 63 struct ins_format2 { 64 + #ifdef __LITTLE_ENDIAN 65 uint32_t shift_control : 8, 66 source : 9, 67 destination : 9, ··· 79 }; 80 81 struct ins_format3 { 82 + #ifdef __LITTLE_ENDIAN 83 uint32_t immediate : 8, 84 source : 9, 85 address : 10,