* [parisc-linux] small add patch from 2.4.19 not yet in 2.4.20
@ 2002-11-22 9:44 jsoe0708
0 siblings, 0 replies; only message in thread
From: jsoe0708 @ 2002-11-22 9:44 UTC (permalink / raw)
To: Helge Deller; +Cc: parisc-linux, puffin
[-- Attachment #1: Type: text/plain, Size: 4213 bytes --]
Hi Helge and all,
Here is some small diff file of some stuff found in 2.4.19-pa24 but not yet
in 2.4.20-rc1. I am not able to judge their importance so I submit it to
your attention.
=================================================================================
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/arch/parisc/kernel/syscall.S
linux-2.4.20-rc1-pa6t/arch/parisc/kernel/syscall.S
--- linux-2.4.20-rc1-pa6/arch/parisc/kernel/syscall.S 2002-08-07 07:43:26.000000000
+0200
+++ linux-2.4.20-rc1-pa6t/arch/parisc/kernel/syscall.S 2002-10-30 18:39:33.000000000
+0100
@@ -593,18 +593,11 @@
ENTRY_DIFF(ftruncate64) /* 200 */
ENTRY_SAME(getdents64)
ENTRY_DIFF(fcntl64)
-#ifdef CONFIG_XFS_FS
- ENTRY_SAME(attrctl)
- ENTRY_SAME(acl_get)
- ENTRY_SAME(acl_set) /* 205 */
-#else
- ENTRY_SAME(ni_syscall)
- ENTRY_SAME(ni_syscall)
- ENTRY_SAME(ni_syscall) /* 205 */
-#endif
- ENTRY_SAME(gettid)
+ ENTRY_SAME(ni_syscall) /* attrctl */
+ ENTRY_SAME(ni_syscall) /* acl_get */
+ ENTRY_SAME(ni_syscall) /* acl_set */
+ ENTRY_SAME(gettid)
ENTRY_SAME(readahead)
- ENTRY_SAME(tkill)
.end
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/drivers/char/hp_psaux.c
linux-2.4.20-rc1-pa6t/drivers/char/hp_psaux.c
--- linux-2.4.20-rc1-pa6/drivers/char/hp_psaux.c 2002-11-13 16:56:38.000000000
+0100
+++ linux-2.4.20-rc1-pa6t/drivers/char/hp_psaux.c 2002-11-01 19:25:48.000000000
+0100
@@ -197,7 +197,7 @@
}
#endif
-static int init_keyb(unsigned long hpa)
+static int __init init_keyb(unsigned long hpa)
{
int res = 0;
unsigned long flags;
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/drivers/net/pcnet32.c
linux-2.4.20-rc1-pa6t/drivers/net/pcnet32.c
--- linux-2.4.20-rc1-pa6/drivers/net/pcnet32.c 2002-11-13 16:58:23.000000000
+0100
+++ linux-2.4.20-rc1-pa6t/drivers/net/pcnet32.c 2002-11-01 21:30:18.000000000
+0100
@@ -45,7 +45,7 @@
#include <linux/skbuff.h>
#include <linux/spinlock.h>
-static const char version[] __devinitdata =
+static const char *version =
DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
/*
@@ -207,10 +207,10 @@
* fix pci probe not increment cards_found
* FD auto negotiate error workaround for xSeries250
* clean up and using new mii module
- * v1.27b Sep 30 2002 Kent Yoder <yoder1@us.ibm.com>
- * Added timer for cable connection state changes.
- * v1.27c Sat Apr 13 2002 Helge Deller <deller@gmx.de>
+ * v1.27b Sat Apr 13 2002 Helge Deller <deller@gmx.de>
* typo-fixes & cleanups
+ * v1.27c Sep 30 2002 Kent Yoder <yoder1@us.ibm.com>
+ * Added timer for cable connection state changes.
*/
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/drivers/scsi/cpqfcTSstructs.h
linux-2.4.20-rc1-pa6t/drivers/scsi/cpqfcTSstructs.h
--- linux-2.4.20-rc1-pa6/drivers/scsi/cpqfcTSstructs.h 2002-11-18 09:10:31.000000000
+0100
+++ linux-2.4.20-rc1-pa6t/drivers/scsi/cpqfcTSstructs.h 2002-11-07 08:56:22.000000000
+0100
@@ -413,7 +413,9 @@
} TachLiteERQ;
// for now, just 32 bit DMA, eventually 40something, with code changes
-#define CPQFCTS_DMA_MASK 0xFFFFFFFFUL
+//#define CPQFCTS_DMA_MASK 0xFFFFFFFFUL
+#define CPQFCTS_DMA_MASK ((unsigned long) (0x00000000FFFFFFFF))
+
#define TL_MAX_SG_ELEM_LEN 0x7ffff // Max buffer length a single S/G entry
// may represent (a hardware limitation). The
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/fs/exec.c
linux-2.4.20-rc1-pa6t/fs/exec.c
--- linux-2.4.20-rc1-pa6/fs/exec.c 2002-11-18 09:24:17.000000000 +0100
+++ linux-2.4.20-rc1-pa6t/fs/exec.c 2002-11-07 10:31:14.000000000 +0100
@@ -394,6 +394,7 @@
struct page *page = bprm->page[i];
if (page) {
bprm->page[i] = NULL;
+ mm->rss++;
put_dirty_page(current,page,stack_base);
}
stack_base += PAGE_SIZE;
=================================================================================
Thanks in advance,
Joel
********************************************************************************
Controlez mieux votre consommation Internet...surfez Tiscali Complete...http://tiscali.complete.be
[-- Attachment #2: linux-2.4.20-rc1-pa6_mine.diff1 --]
[-- Type: application/octet-stream, Size: 3652 bytes --]
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/arch/parisc/kernel/syscall.S linux-2.4.20-rc1-pa6t/arch/parisc/kernel/syscall.S
--- linux-2.4.20-rc1-pa6/arch/parisc/kernel/syscall.S 2002-08-07 07:43:26.000000000 +0200
+++ linux-2.4.20-rc1-pa6t/arch/parisc/kernel/syscall.S 2002-10-30 18:39:33.000000000 +0100
@@ -593,18 +593,11 @@
ENTRY_DIFF(ftruncate64) /* 200 */
ENTRY_SAME(getdents64)
ENTRY_DIFF(fcntl64)
-#ifdef CONFIG_XFS_FS
- ENTRY_SAME(attrctl)
- ENTRY_SAME(acl_get)
- ENTRY_SAME(acl_set) /* 205 */
-#else
- ENTRY_SAME(ni_syscall)
- ENTRY_SAME(ni_syscall)
- ENTRY_SAME(ni_syscall) /* 205 */
-#endif
- ENTRY_SAME(gettid)
+ ENTRY_SAME(ni_syscall) /* attrctl */
+ ENTRY_SAME(ni_syscall) /* acl_get */
+ ENTRY_SAME(ni_syscall) /* acl_set */
+ ENTRY_SAME(gettid)
ENTRY_SAME(readahead)
- ENTRY_SAME(tkill)
.end
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/drivers/char/hp_psaux.c linux-2.4.20-rc1-pa6t/drivers/char/hp_psaux.c
--- linux-2.4.20-rc1-pa6/drivers/char/hp_psaux.c 2002-11-13 16:56:38.000000000 +0100
+++ linux-2.4.20-rc1-pa6t/drivers/char/hp_psaux.c 2002-11-01 19:25:48.000000000 +0100
@@ -197,7 +197,7 @@
}
#endif
-static int init_keyb(unsigned long hpa)
+static int __init init_keyb(unsigned long hpa)
{
int res = 0;
unsigned long flags;
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/drivers/net/pcnet32.c linux-2.4.20-rc1-pa6t/drivers/net/pcnet32.c
--- linux-2.4.20-rc1-pa6/drivers/net/pcnet32.c 2002-11-13 16:58:23.000000000 +0100
+++ linux-2.4.20-rc1-pa6t/drivers/net/pcnet32.c 2002-11-01 21:30:18.000000000 +0100
@@ -45,7 +45,7 @@
#include <linux/skbuff.h>
#include <linux/spinlock.h>
-static const char version[] __devinitdata =
+static const char *version =
DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
/*
@@ -207,10 +207,10 @@
* fix pci probe not increment cards_found
* FD auto negotiate error workaround for xSeries250
* clean up and using new mii module
- * v1.27b Sep 30 2002 Kent Yoder <yoder1@us.ibm.com>
- * Added timer for cable connection state changes.
- * v1.27c Sat Apr 13 2002 Helge Deller <deller@gmx.de>
+ * v1.27b Sat Apr 13 2002 Helge Deller <deller@gmx.de>
* typo-fixes & cleanups
+ * v1.27c Sep 30 2002 Kent Yoder <yoder1@us.ibm.com>
+ * Added timer for cable connection state changes.
*/
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/drivers/scsi/cpqfcTSstructs.h linux-2.4.20-rc1-pa6t/drivers/scsi/cpqfcTSstructs.h
--- linux-2.4.20-rc1-pa6/drivers/scsi/cpqfcTSstructs.h 2002-11-18 09:10:31.000000000 +0100
+++ linux-2.4.20-rc1-pa6t/drivers/scsi/cpqfcTSstructs.h 2002-11-07 08:56:22.000000000 +0100
@@ -413,7 +413,9 @@
} TachLiteERQ;
// for now, just 32 bit DMA, eventually 40something, with code changes
-#define CPQFCTS_DMA_MASK 0xFFFFFFFFUL
+//#define CPQFCTS_DMA_MASK 0xFFFFFFFFUL
+#define CPQFCTS_DMA_MASK ((unsigned long) (0x00000000FFFFFFFF))
+
#define TL_MAX_SG_ELEM_LEN 0x7ffff // Max buffer length a single S/G entry
// may represent (a hardware limitation). The
diff -Naur -x CVS -x .cvsignore -x '*.orig' -x math-emu linux-2.4.20-rc1-pa6/fs/exec.c linux-2.4.20-rc1-pa6t/fs/exec.c
--- linux-2.4.20-rc1-pa6/fs/exec.c 2002-11-18 09:24:17.000000000 +0100
+++ linux-2.4.20-rc1-pa6t/fs/exec.c 2002-11-07 10:31:14.000000000 +0100
@@ -394,6 +394,7 @@
struct page *page = bprm->page[i];
if (page) {
bprm->page[i] = NULL;
+ mm->rss++;
put_dirty_page(current,page,stack_base);
}
stack_base += PAGE_SIZE;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2002-11-22 9:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-11-22 9:44 [parisc-linux] small add patch from 2.4.19 not yet in 2.4.20 jsoe0708
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.