Commit a3786fd8 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://ldm.bkbits.net/linux-2.5-sysfs

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 2f3247a1 439c0243
...@@ -856,7 +856,9 @@ void __init print_IO_APIC(void) ...@@ -856,7 +856,9 @@ void __init print_IO_APIC(void)
printk(KERN_DEBUG "IO APIC #%d......\n", mp_ioapics[apic].mpc_apicid); printk(KERN_DEBUG "IO APIC #%d......\n", mp_ioapics[apic].mpc_apicid);
printk(KERN_DEBUG ".... register #00: %08X\n", *(int *)&reg_00); printk(KERN_DEBUG ".... register #00: %08X\n", *(int *)&reg_00);
printk(KERN_DEBUG "....... : physical APIC id: %02X\n", reg_00.ID); printk(KERN_DEBUG "....... : physical APIC id: %02X\n", reg_00.ID);
if (reg_00.__reserved_1 || reg_00.__reserved_2) printk(KERN_DEBUG "....... : Delivery Type: %X\n", reg_00.delivery_type);
printk(KERN_DEBUG "....... : LTS : %X\n", reg_00.LTS);
if (reg_00.__reserved_0 || reg_00.__reserved_1 || reg_00.__reserved_2)
UNEXPECTED_IO_APIC(); UNEXPECTED_IO_APIC();
printk(KERN_DEBUG ".... register #01: %08X\n", *(int *)&reg_01); printk(KERN_DEBUG ".... register #01: %08X\n", *(int *)&reg_01);
......
...@@ -1279,16 +1279,6 @@ static __inline__ int scsi_data_direction(Scsi_Cmnd *cmd) ...@@ -1279,16 +1279,6 @@ static __inline__ int scsi_data_direction(Scsi_Cmnd *cmd)
#endif /* SCSI_DATA_UNKNOWN */ #endif /* SCSI_DATA_UNKNOWN */
/*
** Head of list of NCR boards
**
** For kernel version < 1.3.70, host is retrieved by its irq level.
** For later kernels, the internal host control block address
** (struct ncb) is used as device id parameter of the irq stuff.
*/
static struct Scsi_Host *first_host = NULL;
/* /*
** /proc directory entry and proc_info function ** /proc directory entry and proc_info function
...@@ -5880,11 +5870,6 @@ ncr_attach (Scsi_Host_Template *tpnt, int unit, ncr_device *device) ...@@ -5880,11 +5870,6 @@ ncr_attach (Scsi_Host_Template *tpnt, int unit, ncr_device *device)
/* /*
** Done. ** Done.
*/
if (!first_host)
first_host = instance;
/*
** Fill Linux host instance structure ** Fill Linux host instance structure
** and return success. ** and return success.
*/ */
...@@ -14228,36 +14213,30 @@ static int sym53c8xx_proc_info(char *buffer, char **start, off_t offset, ...@@ -14228,36 +14213,30 @@ static int sym53c8xx_proc_info(char *buffer, char **start, off_t offset,
printk("sym53c8xx_proc_info: hostno=%d, func=%d\n", hostno, func); printk("sym53c8xx_proc_info: hostno=%d, func=%d\n", hostno, func);
#endif #endif
for (host = first_host; host; host = host->next) { host = scsi_host_hn_get(hostno);
if (host->hostt != first_host->hostt) if (!host)
continue; return -EINVAL;
if (host->host_no == hostno) {
host_data = (struct host_data *) host->hostdata; host_data = (struct host_data *) host->hostdata;
ncb = host_data->ncb; ncb = host_data->ncb;
break; retv = -EINVAL;
}
}
if (!ncb) if (!ncb)
return -EINVAL; goto out;
if (func) { if (func) {
#ifdef SCSI_NCR_USER_COMMAND_SUPPORT #ifdef SCSI_NCR_USER_COMMAND_SUPPORT
retv = ncr_user_command(ncb, buffer, length); retv = ncr_user_command(ncb, buffer, length);
#else
retv = -EINVAL;
#endif #endif
} } else {
else {
if (start) if (start)
*start = buffer; *start = buffer;
#ifdef SCSI_NCR_USER_INFO_SUPPORT #ifdef SCSI_NCR_USER_INFO_SUPPORT
retv = ncr_host_info(ncb, buffer, offset, length); retv = ncr_host_info(ncb, buffer, offset, length);
#else
retv = -EINVAL;
#endif #endif
} }
out:
scsi_host_put(host);
return retv; return retv;
} }
......
...@@ -22,9 +22,12 @@ ...@@ -22,9 +22,12 @@
* The structure of the IO-APIC: * The structure of the IO-APIC:
*/ */
struct IO_APIC_reg_00 { struct IO_APIC_reg_00 {
__u32 __reserved_2 : 24, __u32 __reserved_2 : 14,
LTS : 1,
delivery_type : 1,
__reserved_1 : 8,
ID : 4, ID : 4,
__reserved_1 : 4; __reserved_0 : 4;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct IO_APIC_reg_01 { struct IO_APIC_reg_01 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment