2006-12-08 12:03:56

by Dave Jones

[permalink] [raw]
Subject: Re: [PATCH] slab: remove SLAB_KERNEL

On Thu, Dec 07, 2006 at 04:59:36PM +0000, Linux Kernel wrote:
> Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e94b1766097d53e6f3ccfb36c8baa562ffeda3fc
> Commit: e94b1766097d53e6f3ccfb36c8baa562ffeda3fc
> Parent: 54e6ecb23951b195d02433a741c7f7cb0b796c78
> Author: Christoph Lameter <[email protected]>
> AuthorDate: Wed Dec 6 20:33:17 2006 -0800
> Committer: Linus Torvalds <[email protected]>
> CommitDate: Thu Dec 7 08:39:24 2006 -0800
>
> [PATCH] slab: remove SLAB_KERNEL
>
> SLAB_KERNEL is an alias of GFP_KERNEL.
>
> Signed-off-by: Christoph Lameter <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> Signed-off-by: Linus Torvalds <[email protected]>

Missed one.

Signed-off-by: Dave Jones <[email protected]>


--- linux-2.6.19.noarch/mm/mmap.c~ 2006-12-08 06:51:55.000000000 -0500
+++ linux-2.6.19.noarch/mm/mmap.c 2006-12-08 06:52:05.000000000 -0500
@@ -2226,7 +2226,7 @@ int install_special_mapping(struct mm_st
struct vm_area_struct *vma;
int err;

- vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+ vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
if (unlikely(vma == NULL))
return -ENOMEM;
memset(vma, 0, sizeof(*vma));


2006-12-08 12:58:47

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH] slab: remove SLAB_KERNEL

On Fri, Dec 08 2006, Dave Jones wrote:
> On Thu, Dec 07, 2006 at 04:59:36PM +0000, Linux Kernel wrote:
> > Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e94b1766097d53e6f3ccfb36c8baa562ffeda3fc
> > Commit: e94b1766097d53e6f3ccfb36c8baa562ffeda3fc
> > Parent: 54e6ecb23951b195d02433a741c7f7cb0b796c78
> > Author: Christoph Lameter <[email protected]>
> > AuthorDate: Wed Dec 6 20:33:17 2006 -0800
> > Committer: Linus Torvalds <[email protected]>
> > CommitDate: Thu Dec 7 08:39:24 2006 -0800
> >
> > [PATCH] slab: remove SLAB_KERNEL
> >
> > SLAB_KERNEL is an alias of GFP_KERNEL.
> >
> > Signed-off-by: Christoph Lameter <[email protected]>
> > Signed-off-by: Andrew Morton <[email protected]>
> > Signed-off-by: Linus Torvalds <[email protected]>
>
> Missed one.
>
> Signed-off-by: Dave Jones <[email protected]>
>
>
> --- linux-2.6.19.noarch/mm/mmap.c~ 2006-12-08 06:51:55.000000000 -0500
> +++ linux-2.6.19.noarch/mm/mmap.c 2006-12-08 06:52:05.000000000 -0500
> @@ -2226,7 +2226,7 @@ int install_special_mapping(struct mm_st
> struct vm_area_struct *vma;
> int err;
>
> - vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
> + vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
> if (unlikely(vma == NULL))
> return -ENOMEM;
> memset(vma, 0, sizeof(*vma));

What kernel is that?

--
Jens Axboe

2006-12-08 14:13:13

by Dave Jones

[permalink] [raw]
Subject: Re: [PATCH] slab: remove SLAB_KERNEL

On Fri, Dec 08, 2006 at 01:59:43PM +0100, Jens Axboe wrote:

> > --- linux-2.6.19.noarch/mm/mmap.c~ 2006-12-08 06:51:55.000000000 -0500
> > +++ linux-2.6.19.noarch/mm/mmap.c 2006-12-08 06:52:05.000000000 -0500
> > @@ -2226,7 +2226,7 @@ int install_special_mapping(struct mm_st
> > struct vm_area_struct *vma;
> > int err;
> >
> > - vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
> > + vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
> > if (unlikely(vma == NULL))
> > return -ENOMEM;
> > memset(vma, 0, sizeof(*vma));
>
> What kernel is that?

Oops. My bad. That chunk came from execshield.

Dave