Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102322
b: refs/heads/master
c: 2567d71
h: refs/heads/master
v: v3
  • Loading branch information
Rusty Russell authored and Ingo Molnar committed Jul 17, 2008
1 parent 1775edb commit e7c036a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9354094a95aed456a46b353b1051a7e2fab29045
refs/heads/master: 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c
3 changes: 2 additions & 1 deletion trunk/include/asm-x86/e820.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ struct e820map {
struct e820entry map[E820_X_MAX];
};

#ifdef __KERNEL__
/* see comment in arch/x86/kernel/e820.c */
extern struct e820map e820;
extern struct e820map e820_saved;
Expand Down Expand Up @@ -115,7 +116,7 @@ extern void setup_memory_map(void);
extern char *default_machine_specific_memory_setup(void);
extern char *machine_specific_memory_setup(void);
extern char *memory_setup(void);

#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */

#define ISA_START_ADDRESS 0xa0000
Expand Down

0 comments on commit e7c036a

Please sign in to comment.