public inbox for linux-mtd@lists.infradead.org
 help / color / mirror / Atom feed
* JFFS patch
@ 2003-06-23  5:58 Allen Curtis
  2003-06-24  9:17 ` David Woodhouse
  0 siblings, 1 reply; 11+ messages in thread
From: Allen Curtis @ 2003-06-23  5:58 UTC (permalink / raw)
  To: Infradead Org

[-- Attachment #1: Type: text/plain, Size: 40 bytes --]

Patch for updating JFFS in 2.4.20 kernel

[-- Attachment #2: jffs.patch --]
[-- Type: application/octet-stream, Size: 1513 bytes --]

diff -ru fs/jffs/inode-v23.c ../thales/linuxppc/fs/jffs/inode-v23.c
--- fs/jffs/inode-v23.c	Thu Mar 13 02:04:52 2003
+++ ../thales/linuxppc/fs/jffs/inode-v23.c	Sun Jun 22 22:31:37 2003
@@ -59,7 +59,7 @@
 #include "jffs_proc.h"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)
 #define minor(x) MINOR(x)
 #define major(x) MAJOR(x)
 #endif
Only in ../thales/linuxppc/fs/jffs: inode-v23.c~
diff -ru fs/jffs/intrep.c ../thales/linuxppc/fs/jffs/intrep.c
--- fs/jffs/intrep.c	Tue Mar  5 06:07:39 2002
+++ ../thales/linuxppc/fs/jffs/intrep.c	Sun Jun 22 22:31:37 2003
@@ -71,6 +71,8 @@
 #include <linux/sched.h>
 #include <linux/ctype.h>
 
+#include <linux/mtd/compatmac.h>
+
 #include "intrep.h"
 #include "jffs_fm.h"
 
@@ -3427,7 +3429,8 @@
 			unsigned long signr;
 
 			spin_lock_irq(&current->sigmask_lock);
-			signr = dequeue_signal(&current->blocked, &info);
+			signr = dequeue_signal(current, &current->blocked, &info);
+/*			signr = dequeue_signal(&current->blocked, &info);*/
 			spin_unlock_irq(&current->sigmask_lock);
 
 			switch(signr) {
diff -ru fs/jffs/jffs_fm.c ../thales/linuxppc/fs/jffs/jffs_fm.c
--- fs/jffs/jffs_fm.c	Tue Jan 22 01:48:16 2002
+++ ../thales/linuxppc/fs/jffs/jffs_fm.c	Sun Jun 22 22:31:37 2003
@@ -23,7 +23,7 @@
 #include <linux/compatmac.h>
 #include "jffs_fm.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)
 #define minor(x) MINOR(x)
 #define major(x) MAJOR(x)
 #endif

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2003-12-19 15:59 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <3C6BEE8B5E1BAC42905A93F13004E8AB032ABD2B@mailse01.axis.se>
2003-06-24 10:48 ` JFFS patch Mikael Starvik
2003-06-24 14:37   ` Allen Curtis
2003-06-24 17:34     ` Andrew Goodney
2003-06-23  5:58 Allen Curtis
2003-06-24  9:17 ` David Woodhouse
2003-06-24 10:35   ` Alexander Viro
2003-06-24 10:42     ` David Woodhouse
2003-06-24 14:34   ` Allen Curtis
2003-06-24 14:48     ` David Woodhouse
2003-12-18 22:19     ` David Woodhouse
2003-12-19 15:57       ` Allen Curtis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox