|
|
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13731
Modified Files:
linux-2.6-softcursor-persistent-alloc.patch
linux-2.6-debug-singlebiterror.patch
Log Message:
fixes based on upstream feedback
linux-2.6-softcursor-persistent-alloc.patch:
softcursor.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
Index: linux-2.6-softcursor-persistent-alloc.patch
===================================================================
RCS file:
/cvs/dist/rpms/kernel/devel/linux-2.6-softcursor-persistent-alloc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-softcursor-persistent-alloc.patch 28 Dec 2005 23:48:23 -0000
1.1
+++ linux-2.6-softcursor-persistent-alloc.patch 1 Aug 2006 23:16:41 -0000
1.2
@@ -7,11 +7,11 @@
- u8 *dst, *src;
+ u8 *dst;
+ static u8 *src=NULL;
-+ static int allocsize=0;
++ static int allocsize = 0;
if (info->state != FBINFO_STATE_RUNNING)
return 0;
-@@ -31,9 +33,15 @@ int soft_cursor(struct fb_info *info, st
+@@ -31,9 +33,17 @@ int soft_cursor(struct fb_info *info, st
s_pitch = (cursor->image.width + 7) >> 3;
dsize = s_pitch * cursor->image.height;
@@ -24,8 +24,10 @@
+ allocsize = dsize + sizeof(struct fb_image);
+
+ src = kmalloc(allocsize, GFP_ATOMIC);
-+ if (!src)
++ if (!src) {
++ allocsize = 0;
+ return -ENOMEM;
++ }
+ }
image = (struct fb_image *) (src + dsize);
linux-2.6-debug-singlebiterror.patch:
slab.c | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletion(-)
Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-debug-singlebiterror.patch 22 Mar 2006 23:50:26 -0000
1.8
+++ linux-2.6-debug-singlebiterror.patch 1 Aug 2006 23:16:41 -0000
1.9
@@ -13,36 +13,34 @@
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
---- linux-2.6.16.noarch/mm/slab.c~ 2006-03-22 18:29:27.000000000 -0500
-+++ linux-2.6.16.noarch/mm/slab.c 2006-03-22 18:30:58.000000000 -0500
-@@ -1516,10 +1516,33 @@ static void poison_obj(struct kmem_cache
+diff --git a/mm/slab.c b/mm/slab.c
+index 21ba060..39f1183 100644
+--- a/mm/slab.c
++++ b/mm/slab.c
+@@ -1638,10 +1638,29 @@ static void poison_obj(struct kmem_cache
static void dump_line(char *data, int offset, int limit)
{
int i;
-+ unsigned char total=0, bad_count=0;
++ unsigned char total = 0, bad_count = 0, errors = 0;
printk(KERN_ERR "%03x:", offset);
- for (i = 0; i < limit; i++)
+ for (i = 0; i < limit; i++) {
-+ if (data[offset+i] != POISON_FREE) {
-+ total += data[offset+i];
-+ ++bad_count;
++ if (data[offset + i] != POISON_FREE) {
++ total += data[offset + i];
++ bad_count++;
+ }
printk(" %02x", (unsigned char)data[offset + i]);
+ }
printk("\n");
++
+ if (bad_count == 1) {
-+ switch (total) {
-+ case POISON_FREE ^ 0x01:
-+ case POISON_FREE ^ 0x02:
-+ case POISON_FREE ^ 0x04:
-+ case POISON_FREE ^ 0x08:
-+ case POISON_FREE ^ 0x10:
-+ case POISON_FREE ^ 0x20:
-+ case POISON_FREE ^ 0x40:
-+ case POISON_FREE ^ 0x80:
-+ printk (KERN_ERR "Single bit error detected. Possibly
bad RAM.\n");
++ errors = total ^ POISON_FREE;
++ if (errors && !(errors & (errors-1))) {
++ printk (KERN_ERR "Single bit error detected. Probably
bad RAM.\n");
+#ifdef CONFIG_X86
-+ printk (KERN_ERR "Run memtest86 or other memory test
tool.\n");
++ printk (KERN_ERR "Run memtest86+ or similar memory test
tool.\n");
++#else
++ printk (KERN_ERR "Run a memory test tool.\n");
+#endif
+ return;
+ }
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|