lkml.org 
[lkml]   [2009]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/mm] x86: Change is_ISA_range() into an inline function
    Commit-ID:  65f116f5f16dc3371fce24fb24bc4843b5380ba5
    Gitweb: http://git.kernel.org/tip/65f116f5f16dc3371fce24fb24bc4843b5380ba5
    Author: H. Peter Anvin <hpa@zytor.com>
    AuthorDate: Mon, 23 Nov 2009 14:44:39 -0800
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Mon, 23 Nov 2009 17:09:59 -0800

    x86: Change is_ISA_range() into an inline function

    Change is_ISA_range() from a macro to an inline function. This makes
    it type safe, and also allows it to be assigned to a function pointer
    if necessary.

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    LKML-Reference: <20091119202341.GA4420@sgi.com>
    ---
    arch/x86/include/asm/e820.h | 19 ++++++++++++-------
    1 files changed, 12 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
    index 40b4e61..68b4e0e 100644
    --- a/arch/x86/include/asm/e820.h
    +++ b/arch/x86/include/asm/e820.h
    @@ -61,6 +61,12 @@ struct e820map {
    struct e820entry map[E820_X_MAX];
    };

    +#define ISA_START_ADDRESS 0xa0000
    +#define ISA_END_ADDRESS 0x100000
    +
    +#define BIOS_BEGIN 0x000a0000
    +#define BIOS_END 0x00100000
    +
    #ifdef __KERNEL__
    /* see comment in arch/x86/kernel/e820.c */
    extern struct e820map e820;
    @@ -126,15 +132,14 @@ extern void e820_reserve_resources(void);
    extern void e820_reserve_resources_late(void);
    extern void setup_memory_map(void);
    extern char *default_machine_specific_memory_setup(void);
    -#endif /* __KERNEL__ */
    -#endif /* __ASSEMBLY__ */

    -#define ISA_START_ADDRESS 0xa0000
    -#define ISA_END_ADDRESS 0x100000
    -#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
    +static inline bool is_ISA_range(u64 s, u64 e)
    +{
    + return s >= ISA_START_ADDRESS && e < ISA_END_ADDRESS;
    +}

    -#define BIOS_BEGIN 0x000a0000
    -#define BIOS_END 0x00100000
    +#endif /* __KERNEL__ */
    +#endif /* __ASSEMBLY__ */

    #ifdef __KERNEL__
    #include <linux/ioport.h>

    \
     
     \ /
      Last update: 2009-11-24 02:17    [W:0.022 / U:30.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site