Hi Jens,
Today's linux-next build (powerpc allyesconfig) failed like this:
block/blk-cgroup.c: In function 'blkiocg_create':
block/blk-cgroup.c:285: error: implicit declaration of function 'ERR_PTR'
block/blk-cgroup.c:285: warning: return makes pointer from integer without a cast
block/blk-cgroup.c:289: warning: return makes pointer from integer without a cast
Caused by commit 31e4c28d95e64f2d5d3c497a3ecf37c62de635b4 ("blkio:
Introduce blkio controller cgroup interface").
I applied this patch for today:
From: Stephen Rothwell <[email protected]>
Date: Mon, 7 Dec 2009 19:29:39 +1100
Subject: [PATCH] block: include linux/err.h to use ERR_PTR
Signed-off-by: Stephen Rothwell <[email protected]>
---
block/blk-cgroup.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 3ad497f..1fa2654 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -14,6 +14,7 @@
#include <linux/seq_file.h>
#include <linux/kdev_t.h>
#include <linux/module.h>
+#include <linux/err.h>
#include "blk-cgroup.h"
static DEFINE_SPINLOCK(blkio_list_lock);
--
1.6.5.3
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Mon, Dec 07 2009, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> block/blk-cgroup.c: In function 'blkiocg_create':
> block/blk-cgroup.c:285: error: implicit declaration of function 'ERR_PTR'
> block/blk-cgroup.c:285: warning: return makes pointer from integer without a cast
> block/blk-cgroup.c:289: warning: return makes pointer from integer without a cast
>
> Caused by commit 31e4c28d95e64f2d5d3c497a3ecf37c62de635b4 ("blkio:
> Introduce blkio controller cgroup interface").
>
> I applied this patch for today:
>
> From: Stephen Rothwell <[email protected]>
> Date: Mon, 7 Dec 2009 19:29:39 +1100
> Subject: [PATCH] block: include linux/err.h to use ERR_PTR
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> block/blk-cgroup.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 3ad497f..1fa2654 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -14,6 +14,7 @@
> #include <linux/seq_file.h>
> #include <linux/kdev_t.h>
> #include <linux/module.h>
> +#include <linux/err.h>
> #include "blk-cgroup.h"
>
> static DEFINE_SPINLOCK(blkio_list_lock);
Thanks Stephen, I merged your patch and updated the branches.
--
Jens Axboe
Hi Jens,
On Mon, 7 Dec 2009 09:49:03 +0100 Jens Axboe <[email protected]> wrote:
>
> Thanks Stephen, I merged your patch and updated the branches.
I presume that you build tested as well - or do you trust me ;-)
Thanks.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Mon, Dec 07 2009, Stephen Rothwell wrote:
> Hi Jens,
>
> On Mon, 7 Dec 2009 09:49:03 +0100 Jens Axboe <[email protected]> wrote:
> >
> > Thanks Stephen, I merged your patch and updated the branches.
>
> I presume that you build tested as well - or do you trust me ;-)
In this case I trust you, since you say you tested it and I do consider
you a credible source :-). I did compile locally, as a santity check.
Adding a header I consider pretty low risk.
--
Jens Axboe