projects
/
debian
/
elilo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.10
[debian/elilo]
/
elilo.h
diff --git
a/elilo.h
b/elilo.h
index 74f740d0082f31c360b6f6802c742dc0a5cd4425..ae43705b74e1707d819e4339fdc06bae6e4a5646 100644
(file)
--- a/
elilo.h
+++ b/
elilo.h
@@
-31,6
+31,12
@@
#include <efi.h>
#include <efi.h>
+#ifdef CONFIG_ia32
+#define PTR_FMT L"0x%x"
+#else
+#define PTR_FMT L"0x%lx"
+#endif
+
#include "elilo_debug.h"
#include "fileops.h"
#include "elilo_debug.h"
#include "fileops.h"
@@
-150,6
+156,7
@@
extern VOID *alloc_pages(UINTN, EFI_MEMORY_TYPE, EFI_ALLOCATE_TYPE, VOID *);
extern VOID free_pages(VOID *);
extern VOID free_all(VOID);
extern INTN alloc_kmem(VOID *, UINTN);
extern VOID free_pages(VOID *);
extern VOID free_all(VOID);
extern INTN alloc_kmem(VOID *, UINTN);
+extern INTN alloc_kmem_anywhere(VOID **, UINTN);
extern VOID free_kmem(VOID);
extern VOID free_all_memory(VOID);
extern VOID free_kmem(VOID);
extern VOID free_all_memory(VOID);
@@
-183,7
+190,7
@@
extern CHAR16 *get_config_file(VOID);
extern INTN load_file(CHAR16 *, memdesc_t *);
/* from alternate.c */
extern INTN load_file(CHAR16 *, memdesc_t *);
/* from alternate.c */
-extern INTN alternate_kernel(CHAR16 *, INTN);
+extern INTN alternate_kernel(CHAR16 *,
U
INTN);
/* from bootparams.c */
extern VOID *create_boot_params (CHAR16 *, memdesc_t *, memdesc_t *, UINTN *);
/* from bootparams.c */
extern VOID *create_boot_params (CHAR16 *, memdesc_t *, memdesc_t *, UINTN *);