[PATCH] drm_memory.h: remove double inclusion of linux/vmalloc.h

[PATCH] drm_memory.h: remove double inclusion of linux/vmalloc.h

[Alexander Beregalov]

From: Alexander Beregalov <a.beregalov@gmail.com>

Remove double inclusion of linux/vmalloc.h

drivers/char/drm/drm_memory.h |    2 --
1 files changed, 0 insertions(+), 2 deletions(-)

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h
index 63e425b..15af9b3 100644
--- a/drivers/char/drm/drm_memory.h
+++ b/drivers/char/drm/drm_memory.h
@@ -44,8 +44,6 @@

 #if __OS_HAS_AGP

-#include <linux/vmalloc.h>
-
 #ifdef HAVE_PAGE_AGP
 #include <asm/agp.h>
 #else

Re: [PATCH] drm_memory.h: remove double inclusion of linux/vmalloc.h

[Mark Asselstine]

On Sun, Jul 6, 2008 at 7:31 AM, Alexander Beregalov
<a.beregalov@gmail.com> wrote:
> From: Alexander Beregalov <a.beregalov@gmail.com>
>
> Remove double inclusion of linux/vmalloc.h
>
> drivers/char/drm/drm_memory.h |    2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> ---
>
> diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h
> index 63e425b..15af9b3 100644
> --- a/drivers/char/drm/drm_memory.h
> +++ b/drivers/char/drm/drm_memory.h
> @@ -44,8 +44,6 @@
>
>  #if __OS_HAS_AGP
>
> -#include <linux/vmalloc.h>
> -

Why remove this one and not the one at the top of the file? As well
this file has #include of drmP.h, yet drmP.h is the only file I can
find that includes drm_memory.h. Based on this I would think there is
some additional cleanup that can go on here.

Regards,
Mark Asselstine

>  #ifdef HAVE_PAGE_AGP
>  #include <asm/agp.h>
>  #else
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH] drm_memory.h: remove double inclusion of linux/vmalloc.h

[Ian Romanick]

On Tue, Jul 08, 2008 at 08:29:57AM -0400, Mark Asselstine wrote:
> On Sun, Jul 6, 2008 at 7:31 AM, Alexander Beregalov
> <a.beregalov@gmail.com> wrote:
> > From: Alexander Beregalov <a.beregalov@gmail.com>
> >
> >  #if __OS_HAS_AGP
> >
> > -#include <linux/vmalloc.h>
> > -
> 
> Why remove this one and not the one at the top of the file? As well

I would assume this one is removed because it is inside additional
ifdefs.

> this file has #include of drmP.h, yet drmP.h is the only file I can
> find that includes drm_memory.h. Based on this I would think there is
> some additional cleanup that can go on here.

Re: [PATCH] drm_memory.h: remove double inclusion of linux/vmalloc.h

[Alexander Beregalov]

2008/7/8 Ian Romanick <ianr@q7.com>:
> On Tue, Jul 08, 2008 at 08:29:57AM -0400, Mark Asselstine wrote:
>> On Sun, Jul 6, 2008 at 7:31 AM, Alexander Beregalov
>> <a.beregalov@gmail.com> wrote:
>> > From: Alexander Beregalov <a.beregalov@gmail.com>
>> >
>> >  #if __OS_HAS_AGP
>> >
>> > -#include <linux/vmalloc.h>
>> > -
>>
>> Why remove this one and not the one at the top of the file? As well
>
> I would assume this one is removed because it is inside additional
> ifdefs.
Yes, it does not change functionality of the code.
>
>> this file has #include of drmP.h, yet drmP.h is the only file I can
>> find that includes drm_memory.h. Based on this I would think there is
>> some additional cleanup that can go on here.
How it can be cleaned up? Do you mean to move `define PAGE_AGP` to drmP.h?

Re: [PATCH] drm_memory.h: remove double inclusion of linux/vmalloc.h

[Mark Asselstine]

On Tue, Jul 8, 2008 at 12:56 PM, Alexander Beregalov
<a.beregalov@gmail.com> wrote:
> 2008/7/8 Ian Romanick <ianr@q7.com>:
>> On Tue, Jul 08, 2008 at 08:29:57AM -0400, Mark Asselstine wrote:
>>> On Sun, Jul 6, 2008 at 7:31 AM, Alexander Beregalov
>>> <a.beregalov@gmail.com> wrote:
>>> > From: Alexander Beregalov <a.beregalov@gmail.com>
>>> >
>>> >  #if __OS_HAS_AGP
>>> >
>>> > -#include <linux/vmalloc.h>
>>> > -
>>>
>>> Why remove this one and not the one at the top of the file? As well
>>
>> I would assume this one is removed because it is inside additional
>> ifdefs.
> Yes, it does not change functionality of the code.

I guess I even question if this include should actually be anywhere in
this file.

>>
>>> this file has #include of drmP.h, yet drmP.h is the only file I can
>>> find that includes drm_memory.h. Based on this I would think there is
>>> some additional cleanup that can go on here.
> How it can be cleaned up? Do you mean to move `define PAGE_AGP` to drmP.h?
>

It looks to me like this file at one time was meant to be included by
files other then drmP.h. Including drmP.h ensured __OS_HAS_AGP was
defined and a circular dependence was prevented by ifdefs surrounding
the bulk of drmP.h. As far as I can tell none of the includes in this
file are necessary anymore and a quick x86 compile seems to back me up
(please double check however). Once these are removed there is very
little functionality left and it might make more sense to just put in
into drmP.h. If in the future there is a need for this type of include
it can be started from scratch but for now I would say it should go
away.

Regards,
Mark