⭐ 欢迎来到虫虫下载站! | 📦 资源下载 📁 资源专辑 ℹ️ 关于我们
⭐ 虫虫下载站

📄 patch-2.4.34-pre3

📁 update patch to linux kernel to 2.4.34-pre3
💻 34-PRE3
📖 第 1 页 / 共 5 页
字号:
-	if (SONYPI_ACPI_ACTIVE)-		return ec_read(addr, value);-#endif-	wait_on_command(1, inb_p(SONYPI_CST_IOPORT) & 3, ITERATIONS_LONG);-	outb_p(0x80, SONYPI_CST_IOPORT);-	wait_on_command(0, inb_p(SONYPI_CST_IOPORT) & 2, ITERATIONS_LONG);-	outb_p(addr, SONYPI_DATA_IOPORT);-	wait_on_command(0, inb_p(SONYPI_CST_IOPORT) & 2, ITERATIONS_LONG);-	*value = inb_p(SONYPI_DATA_IOPORT);-	return 0;-}- #endif /* __KERNEL__ */  #endif /* _SONYPI_PRIV_H_ */diff --git a/drivers/char/sx.c b/drivers/char/sx.cindex 5e62045..8cc448c 100644--- a/drivers/char/sx.c+++ b/drivers/char/sx.c@@ -522,13 +522,13 @@ static int sx_busy_wait_eq (struct sx_bo  	func_enter (); -	for (i=0; i < TIMEOUT_1 > 0;i++) +	for (i=0; i < TIMEOUT_1 ;i++) 		if ((read_sx_byte (board, offset) & mask) == correctval) { 			func_exit (); 			return 1; 		} -	for (i=0; i < TIMEOUT_2 > 0;i++) {+	for (i=0; i < TIMEOUT_2 ;i++) { 		if ((read_sx_byte (board, offset) & mask) == correctval) { 			func_exit (); 			return 1;@@ -548,13 +548,13 @@ static int sx_busy_wait_neq (struct sx_b  	func_enter (); -	for (i=0; i < TIMEOUT_1 > 0;i++) +	for (i=0; i < TIMEOUT_1 ;i++) 		if ((read_sx_byte (board, offset) & mask) != badval) { 			func_exit (); 			return 1; 		} -	for (i=0; i < TIMEOUT_2 > 0;i++) {+	for (i=0; i < TIMEOUT_2 ;i++) { 		if ((read_sx_byte (board, offset) & mask) != badval) { 			func_exit (); 			return 1;diff --git a/drivers/char/tpqic02.c b/drivers/char/tpqic02.cindex d694f43..f9d5742 100644--- a/drivers/char/tpqic02.c+++ b/drivers/char/tpqic02.c@@ -202,6 +202,7 @@ static int mode_access;		/* access mode:  static int qic02_get_resources(void); static void qic02_release_resources(void);+static void finish_rw(int cmd);  /* This is a pointer to the actual kernel buffer where the interrupt routines  * read from/write to. It is needed because the DMA channels 1 and 3 cannot@@ -820,7 +821,6 @@ #endif static int tp_sense(int ignore) { 	unsigned err = 0, exnr = 0, gs = 0;-	static void finish_rw(int cmd);  	if (TPQDBG(SENSE_TEXT)) 		printk(TPQIC02_NAME ": tp_sense(ignore=0x%x) enter\n",@@ -2173,16 +2173,6 @@ static ssize_t qic02_tape_write(struct f  * Don't rewind if the minor bits specify density 0.  */ -static int qic02_tape_open(struct inode *inode, struct file *filp)-{-	static int qic02_tape_open_no_use_count(struct inode *,-						struct file *);-	int open_error;--	open_error = qic02_tape_open_no_use_count(inode, filp);-	return open_error;-}- static int qic02_tape_open_no_use_count(struct inode *inode, 					struct file *filp) {@@ -2385,6 +2375,14 @@ static int qic02_tape_open_no_use_count( }				/* qic02_tape_open */  +static int qic02_tape_open(struct inode *inode, struct file *filp)+{+	int open_error;++	open_error = qic02_tape_open_no_use_count(inode, filp);+	return open_error;+}+ static int qic02_tape_release(struct inode *inode, struct file *filp) { 	kdev_t dev = inode->i_rdev;diff --git a/drivers/fc4/soc.h b/drivers/fc4/soc.hindex 740e1a3..0461960 100644--- a/drivers/fc4/soc.h+++ b/drivers/fc4/soc.h@@ -118,14 +118,16 @@ static inline void xram_copy_from (void   		val = ((sbus_readw(x + 0x00UL) << 16) | 		       (sbus_readw(x + 0x02UL)));-		*((u32 *)p)++ = val;+		*(u32 *)p = val;+		p += sizeof(u32); 	} }  static inline void xram_copy_to (xram_p x, void *p, int len) { 	for (len >>= 2; len > 0; len--, x += sizeof(u32)) {-		u32 tmp = *((u32 *)p)++;+		u32 tmp = *(u32 *)p;+		p += sizeof(u32); 		sbus_writew(tmp >> 16, x + 0x00UL); 		sbus_writew(tmp, x + 0x02UL); 	}diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.cindex 516f8f4..db3f1aa 100644--- a/drivers/i2c/i2c-core.c+++ b/drivers/i2c/i2c-core.c@@ -720,7 +720,7 @@ #endif /* def CONFIG_PROC_FS */  * ----------------------------------------------------  */ -int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num)+int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs,int num) { 	int ret; @@ -750,7 +750,7 @@ int i2c_master_send(struct i2c_client *c 		msg.addr   = client->addr; 		msg.flags = client->flags & I2C_M_TEN; 		msg.len = count;-		(const char *)msg.buf = buf;+		msg.buf = (char *)buf; 	 		DEB2(printk(KERN_DEBUG "i2c-core.o: master_send: writing %d bytes on %s.\n", 			count,client->adapter->name));diff --git a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.cindex f5feeb6..fb870ea 100644--- a/drivers/i2c/i2c-proc.c+++ b/drivers/i2c/i2c-proc.c@@ -205,7 +205,7 @@ void i2c_deregister_entry(int id) 		table = i2c_entries[id]->ctl_table; 		unregister_sysctl_table(i2c_entries[id]); 		/* 2-step kfree needed to keep gcc happy about const points */-		(const char *) temp = table[4].procname;+		temp = (char *) table[4].procname; 		kfree(temp); 		kfree(table); 		i2c_entries[id] = NULL;@@ -287,7 +287,7 @@ int i2c_proc_chips(ctl_table * ctl, int  			if(copy_to_user(buffer, BUF, buflen)) 				return -EFAULT; 			curbufsize += buflen;-			(char *) buffer += buflen;+			buffer = (char *) buffer + buflen; 		} 	*lenp = curbufsize; 	filp->f_pos += curbufsize;@@ -318,7 +318,7 @@ int i2c_sysctl_chips(ctl_table * table,  					     sizeof(struct 						    i2c_chips_data))) 					return -EFAULT;-				(char *) oldval +=+				oldval = (char *) oldval + 				    sizeof(struct i2c_chips_data); 				nrels++; 			}@@ -473,7 +473,7 @@ int i2c_parse_reals(int *nrels, void *bu 		       !((ret=get_user(nextchar, (char *) buffer))) && 		       isspace((int) nextchar)) { 			bufsize--;-			((char *) buffer)++;+			buffer = (char *) buffer + 1; 		}  		if (ret)@@ -492,7 +492,7 @@ int i2c_parse_reals(int *nrels, void *bu 		    && (nextchar == '-')) { 			min = 1; 			bufsize--;-			((char *) buffer)++;+			buffer = (char *) buffer + 1; 		} 		if (ret) 			return -EFAULT;@@ -503,7 +503,7 @@ int i2c_parse_reals(int *nrels, void *bu 		       isdigit((int) nextchar)) { 			res = res * 10 + nextchar - '0'; 			bufsize--;-			((char *) buffer)++;+			buffer = (char *) buffer + 1; 		} 		if (ret) 			return -EFAULT;@@ -517,7 +517,7 @@ int i2c_parse_reals(int *nrels, void *bu 		if (bufsize && (nextchar == '.')) { 			/* Skip the dot */ 			bufsize--;-			((char *) buffer)++;+			buffer = (char *) buffer + 1;  			/* Read digits while they are significant */ 			while (bufsize && (mag > 0) &&@@ -526,7 +526,7 @@ int i2c_parse_reals(int *nrels, void *bu 				res = res * 10 + nextchar - '0'; 				mag--; 				bufsize--;-				((char *) buffer)++;+				buffer = (char *) buffer + 1; 			} 			if (ret) 				return -EFAULT;@@ -542,7 +542,7 @@ int i2c_parse_reals(int *nrels, void *bu 		       !((ret=get_user(nextchar, (char *) buffer))) && 		       !isspace((int) nextchar)) { 			bufsize--;-			((char *) buffer)++;+			buffer = (char *) buffer + 1; 		} 		if (ret) 			return -EFAULT;@@ -574,7 +574,7 @@ #define BUFLEN 20 			if(put_user(' ', (char *) buffer)) 				return -EFAULT; 			curbufsize++;-			((char *) buffer)++;+			buffer = (char *) buffer + 1; 		}  		/* Fill BUF with the representation of the next string */@@ -615,7 +615,7 @@ #define BUFLEN 20 		if(copy_to_user(buffer, BUF, buflen)) 			return -EFAULT; 		curbufsize += buflen;-		(char *) buffer += buflen;+		buffer = (char *) buffer + buflen;  		nr++; 	}diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.cindex 3c7b0e0..353a0e2 100644--- a/drivers/ide/legacy/hd.c+++ b/drivers/ide/legacy/hd.c@@ -694,7 +694,11 @@ static int hd_release(struct inode * ino 	return 0; } -extern struct block_device_operations hd_fops;+static struct block_device_operations hd_fops = {+	open:		hd_open,+	release:	hd_release,+	ioctl:		hd_ioctl,+};  static struct gendisk hd_gendisk = { 	major:		MAJOR_NR,@@ -718,12 +722,6 @@ static void hd_interrupt(int irq, void * 	sti(); } -static struct block_device_operations hd_fops = {-	open:		hd_open,-	release:	hd_release,-	ioctl:		hd_ioctl,-};- /*  * This is the hard disk IRQ description. The SA_INTERRUPT in sa_flags  * means we run the IRQ-handler with interrupts disabled:  this is bad fordiff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.cindex b61c16c..0f7524f 100644--- a/drivers/ieee1394/highlevel.c+++ b/drivers/ieee1394/highlevel.c@@ -500,7 +500,7 @@ int highlevel_read(struct hpsb_host *hos                                 rcode = RCODE_TYPE_ERROR;                         } -			(u8 *)data += partlength;+			data += partlength;                         length -= partlength;                         addr += partlength; @@ -546,7 +546,7 @@ int highlevel_write(struct hpsb_host *ho                                 rcode = RCODE_TYPE_ERROR;                         } -			(u8 *)data += partlength;+			data += partlength;                         length -= partlength;                         addr += partlength; diff --git a/drivers/isdn/avmb1/c4.c b/drivers/isdn/avmb1/c4.cindex 0cf7b30..dc17479 100644--- a/drivers/isdn/avmb1/c4.c+++ b/drivers/isdn/avmb1/c4.c@@ -22,6 +22,7 @@ #include <linux/capi.h> #include <linux/kernelcapi.h> #include <linux/init.h> #include <asm/io.h>+#include <asm/processor.h> #include <asm/uaccess.h> #include <linux/netdevice.h> #include "capicmd.h"@@ -151,6 +152,7 @@ static inline int wait_for_doorbell(avmc 	while (c4inmeml(card->mbase+DOORBELL) != 0xffffffff) { 		if (!time_before(jiffies, stop)) 			return -1;+		cpu_relax(); 	} 	return 0; }@@ -305,6 +307,7 @@ static void c4_reset(avmcard *card) 		if (!time_before(jiffies, stop)) 			return; 		c4outmeml(card->mbase+DOORBELL, DBELL_ADDR);+		cpu_relax(); 	}  	c4_poke(card, DC21285_ARMCSR_BASE + CHAN_1_CONTROL, 0);@@ -328,6 +331,7 @@ static int c4_detect(avmcard *card) 		if (!time_before(jiffies, stop)) 			return 2; 		c4outmeml(card->mbase+DOORBELL, DBELL_ADDR);+		cpu_relax(); 	}  	c4_poke(card, DC21285_ARMCSR_BASE + CHAN_1_CONTROL, 0);diff --git a/drivers/isdn/eicon/eicon.h b/drivers/isdn/eicon/eicon.hindex 1fce94a..3833ddc 100644--- a/drivers/isdn/eicon/eicon.h+++ b/drivers/isdn/eicon/eicon.h@@ -154,18 +154,18 @@ typedef struct {   __u16 NextReq  __attribute__ ((packed));  /* pointer to next Req Buffer */   __u16 NextRc   __attribute__ ((packed));  /* pointer to next Rc Buffer  */   __u16 NextInd  __attribute__ ((packed));  /* pointer to next Ind Buffer */-  __u8 ReqInput  __attribute__ ((packed));  /* number of Req Buffers sent */-  __u8 ReqOutput  __attribute__ ((packed)); /* number of Req Buffers returned */-  __u8 ReqReserved  __attribute__ ((packed));/*number of Req Buffers reserved */-  __u8 Int  __attribute__ ((packed));       /* ISDN-P interrupt           */-  __u8 XLock  __attribute__ ((packed));     /* Lock field for arbitration */-  __u8 RcOutput  __attribute__ ((packed));  /* number of Rc buffers received */-  __u8 IndOutput  __attribute__ ((packed)); /* number of Ind buffers received */-  __u8 IMask  __attribute__ ((packed));     /* Interrupt Mask Flag        */-  __u8 Reserved1[2]  __attribute__ ((packed)); /* reserved field, do not use */-  __u8 ReadyInt  __attribute__ ((packed));  /* request field for ready int */-  __u8 Reserved2[12]  __attribute__ ((packed)); /* reserved field, do not use */-  __u8 InterfaceType  __attribute__ ((packed)); /* interface type 1=16K    */+  __u8 ReqInput;  /* number of Req Buffers sent */+  __u8 ReqOutput; /* number of Req Buffers returned */+  __u8 ReqReserved;/*number of Req Buffers reserved */+  __u8 Int;       /* ISDN-P interrupt           */+  __u8 XLock;     /* Lock field for arbitration */+  __u8 RcOutput;  /* number of Rc buffers received */+  __u8 IndOutput; /* number of Ind buffers received */+  __u8 IMask;     /* Interrupt Mask Flag        */+  __u8 Reserved1[2]; /* reserved field, do not use */+  __u8 ReadyInt;  /* request field for ready int */+  __u8 Reserved2[12]; /* reserved field, do not use */+  __u8 InterfaceType; /* interface type 1=16K    */   __u16 Signature  __attribute__ ((packed));    /* ISDN-P initialized ind  */   __u8 B[1];                            /* buffer space for Req,Ind and Rc */ } eicon_pr_ram;@@ -344,7 +344,6 @@ #endif /* CONFIG_MCA */  #include "eicon_idi.h" -extern eicon_card *cards; extern char *eicon_ctype_name[];  diff --git a/drivers/isdn/eicon/eicon_idi.h b/drivers/isdn/eicon/eicon_idi.hindex eefa56e..579f672 100644--- a/drivers/isdn/eicon/eicon_idi.h+++ b/drivers/isdn/eicon/eicon_idi.h@@ -58,35 +58,35 @@ typedef struct {

⌨️ 快捷键说明

复制代码 Ctrl + C
搜索代码 Ctrl + F
全屏模式 F11
切换主题 Ctrl + Shift + D
显示快捷键 ?
增大字号 Ctrl + =
减小字号 Ctrl + -