Skip to content

Commit

Permalink
x86: Change is_ISA_range() into an inline function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H. Peter Anvin committed Nov 24, 2009
1 parent 8a27138 commit 65f116f
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions arch/x86/include/asm/e820.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 65f116f

Please sign in to comment.