diff for duplicates of <20100328112522.GL5069@bicker> diff --git a/a/1.txt b/N1/1.txt index a2cc6f7..5f61f8f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,10 +7,11 @@ index e4865f9..7732268 100644 --- a/drivers/gpu/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c @@ -77,7 +77,7 @@ static void *agp_remap(unsigned long offset, unsigned long size, - && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) > (offset + size)) + && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >= + (offset + size)) break; - if (!agpmem) -+ if (&agpmem->head = &dev->agp->memory) ++ if (&agpmem->head == &dev->agp->memory) return NULL; /* diff --git a/a/content_digest b/N1/content_digest index 8b40df7..8b66c18 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] drm: fix check for end of loop\0" - "Date\0Sun, 28 Mar 2010 11:25:22 +0000\0" + "Date\0Sun, 28 Mar 2010 14:25:22 +0300\0" "To\0David Airlie <airlied@linux.ie>\0" "Cc\0Eric Anholt <eric@anholt.net>" Dave Airlie <airlied@redhat.com> @@ -18,12 +18,13 @@ "--- a/drivers/gpu/drm/drm_memory.c\n" "+++ b/drivers/gpu/drm/drm_memory.c\n" "@@ -77,7 +77,7 @@ static void *agp_remap(unsigned long offset, unsigned long size,\n" - " \t\t && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) > \t\t (offset + size))\n" + " \t\t && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >=\n" + " \t\t (offset + size))\n" " \t\t\tbreak;\n" "-\tif (!agpmem)\n" - "+\tif (&agpmem->head = &dev->agp->memory)\n" + "+\tif (&agpmem->head == &dev->agp->memory)\n" " \t\treturn NULL;\n" " \n" " \t/*" -c9bf9bab38524c4b6a3a1a1dd85d75ed0bd26de1bb197d9d859876e323e23797 +9ecceae6a896616e5be9f807cbffeb9e7f1cdbbf2a8d65d76fcd40ec8cf0135b
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.