+ build-failure-on-axonram.patch added to -mm tree

[akpm]

The patch titled
     build failure on axonram
has been added to the -mm tree.  Its filename is
     build-failure-on-axonram.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: build failure on axonram
From: Kamalesh Babulal <[EMAIL PROTECTED]>

Hi Andrew,

The build fails with the following error message.

  CC      arch/powerpc/sysdev/axonram.o
arch/powerpc/sysdev/axonram.c:120:34: error: macro "bio_io_error" passed 2 
arguments, but takes just 1
arch/powerpc/sysdev/axonram.c: In function ‘axon_ram_make_request’:
arch/powerpc/sysdev/axonram.c:120: error: ‘bio_io_error’ undeclared (first 
use in this function)
arch/powerpc/sysdev/axonram.c:120: error: (Each undeclared identifier is 
reported only once
arch/powerpc/sysdev/axonram.c:120: error: for each function it appears in.)
arch/powerpc/sysdev/axonram.c:134: error: too many arguments to function 
‘bio_endio’
make[1]: *** [arch/powerpc/sysdev/axonram.o] Error 1
make: *** [arch/powerpc/sysdev] Error 2

The patch fixes the build failure.

Signed-off-by : Kamalesh Babulal <[EMAIL PROTECTED]>

Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 arch/powerpc/sysdev/axonram.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/powerpc/sysdev/axonram.c~build-failure-on-axonram 
arch/powerpc/sysdev/axonram.c
--- a/arch/powerpc/sysdev/axonram.c~build-failure-on-axonram
+++ a/arch/powerpc/sysdev/axonram.c
@@ -117,7 +117,7 @@ axon_ram_make_request(struct request_que
        transfered = 0;
        bio_for_each_segment(vec, bio, idx) {
                if (unlikely(phys_mem + vec->bv_len > phys_end)) {
-                       bio_io_error(bio, bio->bi_size);
+                       bio_io_error(bio);
                        rc = -ERANGE;
                        break;
                }
@@ -131,7 +131,7 @@ axon_ram_make_request(struct request_que
                phys_mem += vec->bv_len;
                transfered += vec->bv_len;
        }
-       bio_endio(bio, transfered, 0);
+       bio_endio(bio, 0);
 
        return rc;
 }
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

git-nfsd.patch
disable-kgdb-on-ppc.patch
memoryless-nodes-fixup-uses-of-node_online_map-in-generic-code-fix.patch
use-extended-crashkernel-command-line-on-ia64-fix.patch
build-failure-on-axonram.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html