📄 patch-2.4.34-pre3
字号:
@@ -353,7 +352,6 @@ extern const struct hardware_info sm_hw_ extern const struct modem_tx_info *sm_modem_tx_table[]; extern const struct modem_rx_info *sm_modem_rx_table[];-extern const struct hardware_info *sm_hardware_table[]; /* --------------------------------------------------------------------- */ diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.cindex 5b78bb1..7d1bc00 100644--- a/drivers/net/irda/donauboe.c+++ b/drivers/net/irda/donauboe.c@@ -209,7 +209,11 @@ static int do_probe = DO_PROBE; #ifdef CRC_EXPORTED extern __u16 const irda_crc16_table[]; #else-static __u16 const irda_crc16_table[256] = {+/* Our local version of irda_crc16_table must have a unique+ name to prevent extern-redefined-as-static compile errors.+ This #define redirects the irda_fcs() macro to our version. */+#define irda_crc16_table donauboe_irda_crc16_table+static __u16 const donauboe_irda_crc16_table[256] = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.cindex 7838e0d..8bb368c 100644--- a/drivers/net/rrunner.c+++ b/drivers/net/rrunner.c@@ -234,7 +234,7 @@ #endif * Don't access any registes before this point! */ #ifdef __BIG_ENDIAN- writel(readl(®s->HostCtrl) | NO_SWAP, ®s->HostCtrl);+ writel(readl(&rrpriv->regs->HostCtrl) | NO_SWAP, &rrpriv->regs->HostCtrl); #endif /* * Need to add a case for little-endian 64-bit hosts here.diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.cindex f03dc79..be0a169 100644--- a/drivers/net/sk98lin/skvpd.c+++ b/drivers/net/sk98lin/skvpd.c@@ -472,7 +472,7 @@ SK_IOC IoC) /* IO Context */ ((unsigned char)pAC->vpd.vpd_buf[0x40] == 0x3c) && ((unsigned char)pAC->vpd.vpd_buf[0x41] == 0x45) ) { printk(KERN_INFO "sk98lin : humm... Asus mainboard with buggy VPD ? correcting data.\n");- (unsigned char)pAC->vpd.vpd_buf[0x40] = 0x38;+ pAC->vpd.vpd_buf[0x40] = 0x38; } /* find the end tag of the RO area */diff --git a/drivers/net/wan/comx-hw-comx.c b/drivers/net/wan/comx-hw-comx.cindex dedb224..e78738e 100644--- a/drivers/net/wan/comx-hw-comx.c+++ b/drivers/net/wan/comx-hw-comx.c@@ -92,9 +92,9 @@ struct comx_privdata { }; static struct net_device *memory_used[(COMX_MEM_MAX - COMX_MEM_MIN) / 0x10000];-extern struct comx_hardware hicomx_hw;-extern struct comx_hardware comx_hw;-extern struct comx_hardware cmx_hw;+static struct comx_hardware hicomx_hw;+static struct comx_hardware comx_hw;+static struct comx_hardware cmx_hw; static void COMX_interrupt(int irq, void *dev_id, struct pt_regs *regs); diff --git a/drivers/net/wan/comx.h b/drivers/net/wan/comx.hindex 0f7404f..4c58d4d 100644--- a/drivers/net/wan/comx.h+++ b/drivers/net/wan/comx.h@@ -212,8 +212,6 @@ #ifndef SEEK_END #define SEEK_END 2 #endif -extern struct proc_dir_entry * comx_root_dir;- extern int comx_register_hardware(struct comx_hardware *comx_hw); extern int comx_unregister_hardware(char *name); extern int comx_register_protocol(struct comx_protocol *comx_line);diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.cindex fe74a21..d0ed22a 100644--- a/drivers/net/wan/sdla.c+++ b/drivers/net/wan/sdla.c@@ -319,7 +319,7 @@ static int sdla_cpuspeed(struct net_devi struct _dlci_stat { short dlci __attribute__((packed));- char flags __attribute__((packed));+ char flags; }; struct _frad_stat diff --git a/drivers/net/wan/sdla_fr.c b/drivers/net/wan/sdla_fr.cindex 4fd68ec..8a094e9 100644--- a/drivers/net/wan/sdla_fr.c+++ b/drivers/net/wan/sdla_fr.c@@ -302,7 +302,7 @@ #define TMR_INT_ENABLED_UNCONFIG 0x20 typedef struct dlci_status { unsigned short dlci PACKED;- unsigned char state PACKED;+ unsigned char state; } dlci_status_t; typedef struct dlci_IB_mapping@@ -316,9 +316,9 @@ typedef struct dlci_IB_mapping */ typedef struct fr_dlci_interface {- unsigned char gen_interrupt PACKED;+ unsigned char gen_interrupt; unsigned short packet_length PACKED;- unsigned char reserved PACKED;+ unsigned char reserved; } fr_dlci_interface_t; /* variable for keeping track of enabling/disabling FT1 monitor status */@@ -3929,7 +3929,7 @@ static int process_udp_mgmt_pkt(sdla_t* break; } - (void *)ptr_trc_el = card->u.f.curr_trc_el;+ ptr_trc_el = (void *)card->u.f.curr_trc_el; buffer_length = 0; fr_udp_pkt->data[0x00] = 0x00;@@ -3980,7 +3980,7 @@ static int process_udp_mgmt_pkt(sdla_t* ptr_trc_el ++; if((void *)ptr_trc_el > card->u.f.trc_el_last)- (void*)ptr_trc_el = card->u.f.trc_el_base;+ ptr_trc_el = (void*)card->u.f.trc_el_base; buffer_length += sizeof(fpipemon_trc_hdr_t); if(fpipemon_trc->fpipemon_trc_hdr.data_passed) {diff --git a/drivers/net/wan/sdla_x25.c b/drivers/net/wan/sdla_x25.cindex 0cfc8a4..3915c37 100644--- a/drivers/net/wan/sdla_x25.c+++ b/drivers/net/wan/sdla_x25.c@@ -304,26 +304,26 @@ #endif #ifdef NEX_OLD_CALL_INFO typedef struct x25_call_info {- char dest[17]; PACKED;/* ASCIIZ destination address */- char src[17]; PACKED;/* ASCIIZ source address */- char nuser; PACKED;/* number of user data bytes */- unsigned char user[127]; PACKED;/* user data */- char nfacil; PACKED;/* number of facilities */+ char dest[17]; /* ASCIIZ destination address */+ char src[17]; /* ASCIIZ source address */+ char nuser; /* number of user data bytes */+ unsigned char user[127]; /* user data */+ char nfacil; /* number of facilities */ struct {- unsigned char code; PACKED;- unsigned char parm; PACKED;+ unsigned char code;+ unsigned char parm; } facil[64]; /* facilities */ } x25_call_info_t; #else typedef struct x25_call_info {- char dest[MAX_X25_ADDR_SIZE] PACKED;/* ASCIIZ destination address */- char src[MAX_X25_ADDR_SIZE] PACKED;/* ASCIIZ source address */- unsigned char nuser PACKED;- unsigned char user[MAX_X25_DATA_SIZE] PACKED;/* user data */- unsigned char nfacil PACKED;- unsigned char facil[MAX_X25_FACL_SIZE] PACKED;+ char dest[MAX_X25_ADDR_SIZE]; /* ASCIIZ destination address */+ char src[MAX_X25_ADDR_SIZE]; /* ASCIIZ source address */+ unsigned char nuser;+ unsigned char user[MAX_X25_DATA_SIZE];/* user data */+ unsigned char nfacil;+ unsigned char facil[MAX_X25_FACL_SIZE]; unsigned short lcn PACKED; } x25_call_info_t; #endifdiff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.cindex be2b7f7..48ccf19 100644--- a/drivers/net/wan/sdladrv.c+++ b/drivers/net/wan/sdladrv.c@@ -1002,7 +1002,7 @@ int sdla_peek (sdlahw_t* hw, unsigned lo peek_by_4 ((unsigned long)hw->dpmbase + curpos, buf, curlen); addr += curlen;- (char*)buf += curlen;+ buf = (char*)buf + curlen; len -= curlen; } @@ -1086,7 +1086,7 @@ int sdla_poke (sdlahw_t* hw, unsigned lo poke_by_4 ((unsigned long)hw->dpmbase + curpos, buf, curlen); addr += curlen;- (char*)buf += curlen;+ buf = (char*)buf + curlen; len -= curlen; } @@ -2127,10 +2127,10 @@ #endif modname, hw->irq); /* map the physical PCI memory to virtual memory */- (void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,+ hw->dpmbase = (void *)ioremap((unsigned long)S514_mem_base_addr, (unsigned long)MAX_SIZEOF_S514_MEMORY); /* map the physical control register memory to virtual memory */- (void *)hw->vector = ioremap(+ hw->vector = (unsigned long)ioremap( (unsigned long)(S514_mem_base_addr + S514_CTRL_REG_BYTE), (unsigned long)16); diff --git a/drivers/net/wan/sdlamain.c b/drivers/net/wan/sdlamain.cindex 3db44fc..0cc10a6 100644--- a/drivers/net/wan/sdlamain.c+++ b/drivers/net/wan/sdlamain.c@@ -1027,7 +1027,7 @@ static int ioctl_dump (sdla_t* card, sdl #endif dump.length -= len; dump.offset += len;- (char*)dump.ptr += len;+ dump.ptr = (char*)dump.ptr + len; } sdla_mapmem(&card->hw, oldvec);/* restore DPM window position */diff --git a/drivers/sbus/char/pcikbd.h b/drivers/sbus/char/pcikbd.hindex a9e3809..2fb826a 100644--- a/drivers/sbus/char/pcikbd.h+++ b/drivers/sbus/char/pcikbd.h@@ -31,9 +31,6 @@ #define KBD_TIMEOUT (HZ/4) /* Timeout f extern unsigned char pckbd_read_mask; extern unsigned char aux_device_present; -extern unsigned long pcikbd_iobase;-extern unsigned int pcikbd_irq;- /* * Keyboard Controller Registers *diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.cindex d84b30b..9f96173 100644--- a/drivers/scsi/advansys.c+++ b/drivers/scsi/advansys.c@@ -3456,9 +3456,9 @@ #define QHSTA_M_SGBACKUP_ERROR 0x47 /* * Default EEPROM Configuration structure defined in a_init.c. */-extern ADVEEP_3550_CONFIG Default_3550_EEPROM_Config;-extern ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config;-extern ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config;+static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config;+static ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config;+static ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config; /* * DvcGetPhyAddr() flag arguments@@ -7171,7 +7171,7 @@ #if ASC_LINUX_KERNEL24 * then return the number of underrun bytes. */ if (scp->request_bufflen != 0 && qdonep->remain_bytes != 0 &&- qdonep->remain_bytes <= scp->request_bufflen != 0) {+ qdonep->remain_bytes <= scp->request_bufflen) { ASC_DBG1(1, "asc_isr_callback: underrun condition %u bytes\n", (unsigned) qdonep->remain_bytes); scp->resid = qdonep->remain_bytes;diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.cindex 7dc4261..1648276 100644--- a/drivers/scsi/atp870u.c+++ b/drivers/scsi/atp870u.c@@ -807,19 +807,19 @@ oktosend: bttl = virt_to_bus(sgpnt[j].address); l = sgpnt[j].length; while (l > 0x10000) {- (unsigned short int) (((unsigned short int *) (prd))[i + 3]) = 0x0000;- (unsigned short int) (((unsigned short int *) (prd))[i + 2]) = 0x0000;- (unsigned long) (((unsigned long *) (prd))[i >> 1]) = bttl;+ (((unsigned short int *) (prd))[i + 3]) = 0x0000;+ (((unsigned short int *) (prd))[i + 2]) = 0x0000;+ (((unsigned long *) (prd))[i >> 1]) = bttl; l -= 0x10000; bttl += 0x10000; i += 0x04; }- (unsigned long) (((unsigned long *) (prd))[i >> 1]) = bttl;- (unsigned short int) (((unsigned short int *) (prd))[i + 2]) = l;- (unsigned short int) (((unsigned short int *) (prd))[i + 3]) = 0;+ (((unsigned long *) (prd))[i >> 1]) = bttl;+ (((unsigned short int *) (prd))[i + 2]) = l;+ (((unsigned short int *) (prd))[i + 3]) = 0; i += 0x04; }- (unsigned short int) (((unsigned short int *) (prd))[i - 1]) = 0x8000;+ (((unsigned short int *) (prd))[i - 1]) = 0x8000; } else { /* * For a linear request write a chain of blocks@@ -828,16 +828,16 @@ oktosend: l = workrequ->request_bufflen; i = 0; while (l > 0x10000) {- (unsigned short int) (((unsigned short int *) (prd))[i + 3]) = 0x0000;- (unsigned short int) (((unsigned short int *) (prd))[i + 2]) = 0x0000;- (unsigned long) (((unsigned long *) (prd))[i >> 1]) = bttl;+ (((unsigned short int *) (prd))[i + 3]) = 0x0000;+ (((unsigned short int *) (prd))[i + 2]) = 0x0000;+ (((unsigned long *) (prd))[i >> 1]) = bttl; l -= 0x10000; bttl += 0x10000; i += 0x04; }- (unsigned short int) (((unsigned short int *) (prd))[i + 3]) = 0x8000;- (unsigned short int) (((unsigned short int *) (prd))[i + 2]) = l;- (unsigned long) (((unsigned long *) (prd))[i >> 1]) = bttl;+ (((unsigned short int *) (prd))[i + 3]) = 0x8000;+ (((unsigned short int *) (prd))[i + 2]) = l;+ (((unsigned long *) (prd))[i >> 1]) = bttl; } tmpcip = tmpcip + 4; dev->id[target_id].prdaddru = virt_to_bus(dev->id[target_id].prd_tableu);diff --git a/drivers/scsi/cpqfcTSstructs.h b/drivers/scsi/cpqfcTSstructs.hindex 414aa7b..4ae0069 100644--- a/drivers/scsi/cpqfcTSstructs.h+++ b/drivers/scsi/cpqfcTSstructs.h@@ -965,7 +965,6 @@ void fcSestReset(CPQFCHBA *); void cpqfc_pci_unmap(struct pci_dev *pcidev, Scsi_Cmnd * cmd, PTACHYON fcChip, __u32 x_ID); -extern const __u8 valid_al_pa[]; extern const int number_of_al_pa; #define FCP_RESID_UNDER 0x80000diff --git a/drivers/scsi/cpqfcTSworker.c b/drivers/scsi/cpqfcTSworker.cindex b1dda80..7ce9b01 100644--- a/drivers/scsi/cpqfcTSworker.c+++ b/drivers/scsi/cpqfcTSworker.c@@ -48,6 +48,7 @@ #include "hosts.h" // struct Scsi_Host #include "cpqfcTSchip.h" #include "cpqfcTSstructs.h" #include "cpqfcTStrigger.h"+static const __u8 valid_al_pa[]; //#define LOGIN_DBG 1 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.cindex 905b8a0..8b8f281 100644--- a/drivers/scsi/sg.c+++ b/drivers/scsi/sg.c@@ -1192,7 +1192,7 @@ static int sg_mmap(struct file * filp, s sg_rb_correct4mmap(rsv_schp, 1); /* do only once per fd lifetime */ sfp->mmap_called = 1; }- vma->vm_flags |= (VM_RESERVED | VM_IO);+ vma->vm_flags |= VM_RESERVED; vma->vm_private_data = sfp; vma->vm_ops = &sg_mmap_vm_ops; return 0;diff --git a/drivers/sound/sound_firmware.c b/drivers/sound/sound_firmware.cindex 9e8691d..7babebd 100644--- a/drivers/sound/sound_firmware.c+++ b/drivers/sound/sound_firmware.c@@ -4,10 +4,11 @@ #include <linux/module.h> #include <linux/fs.h> #include <linux/mm.h> #include <linux/slab.h>-#include <linux/unistd.h>+static int my_errno;+#define errno my_errno+#include <asm/unistd.h> #include <asm/uaccess.h> -static int errno; static int do_mod_firmware_load(const char *fn, char **fp) { int fd;diff --git a/drivers/sound/wavfront.c b/drivers/sound/wavfront.cindex 632e731..92fcb20 100644--- a/drivers/sound/wavfront.c+++ b/drivers/sound/wavfront.c@@ -2484,11 +2484,11 @@ #define __KERNEL_SYSCALLS__ #include <linux/fs.h> #include <linux/mm.h> #⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -