patch-2.4.11-dontuse linux/include/linux/mtd/cfi.h

• Lines: 34
• Date: Thu Oct 4 15:13:18 2001
• Orig file: v2.4.10/linux/include/linux/mtd/cfi.h
• Orig date: Mon Aug 27 12:41:48 2001

diff -u --recursive --new-file v2.4.10/linux/include/linux/mtd/cfi.h linux/include/linux/mtd/cfi.h
@@ -1,7 +1,7 @@
 
 /* Common Flash Interface structures 
  * See http://support.intel.com/design/flash/technote/index.htm
- * $Id: cfi.h,v 1.22 2001/07/06 09:29:07 dwmw2 Exp $
+ * $Id: cfi.h,v 1.25 2001/09/04 07:06:21 dwmw2 Exp $
  */
 
 #ifndef __MTD_CFI_H__
@@ -244,7 +244,7 @@
 	struct mtd_info *(*cmdset_setup)(struct map_info *);
 	struct cfi_ident *cfiq; /* For now only one. We insist that all devs
 				  must be of the same type. */
-	__u8 mfr, id;
+	int mfr, id;
 	int numchips;
 	unsigned long chipshift; /* Because they're of the same type */
 	const char *im_name;	 /* inter_module name for cmdset_setup */
@@ -368,8 +368,13 @@
 static inline void cfi_udelay(int us)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
-	if (current->need_resched)
-		schedule();
+	if (current->need_resched) {
+		unsigned long t = us * HZ / 1000000;
+		if (t < 1)
+			t = 1;
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		schedule_timeout(t);
+	}
 	else
 #endif
 		udelay(us);