lkml.org 
[lkml]   [2011]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/40] UAPI: Remove the inclusion of linux/types.h from x86's asm/page.h [ver #3]
    Date
    Remove the inclusion of linux/types.h from x86's asm/page.h as it's included
    via asm/page_types.h. Make asm/page_types.h's inclusion dependent on not being
    in assembly.

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    arch/x86/include/asm/page.h | 2 --
    arch/x86/include/asm/page_types.h | 3 +++
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
    index 8ca8283..d4ee8d8 100644
    --- a/arch/x86/include/asm/page.h
    +++ b/arch/x86/include/asm/page.h
    @@ -1,8 +1,6 @@
    #ifndef _ASM_X86_PAGE_H
    #define _ASM_X86_PAGE_H

    -#include <linux/types.h>
    -
    #ifdef __KERNEL__

    #include <asm/page_types.h>
    diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
    index bce688d..eeff662 100644
    --- a/arch/x86/include/asm/page_types.h
    +++ b/arch/x86/include/asm/page_types.h
    @@ -2,7 +2,10 @@
    #define _ASM_X86_PAGE_DEFS_H

    #include <linux/const.h>
    +
    +#ifndef __ASSEMBLY__
    #include <linux/types.h>
    +#endif

    /* PAGE_SHIFT determines the page size */
    #define PAGE_SHIFT 12


    \
     
     \ /
      Last update: 2011-07-28 17:55    [W:0.045 / U:0.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site