diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/lmb.h | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/lmb.h')
| -rw-r--r-- | include/linux/lmb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 2442e3f3d033..ef82b8fcbddb 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h | |||
| @@ -54,6 +54,7 @@ extern u64 __init lmb_phys_mem_size(void); | |||
| 54 | extern u64 lmb_end_of_DRAM(void); | 54 | extern u64 lmb_end_of_DRAM(void); |
| 55 | extern void __init lmb_enforce_memory_limit(u64 memory_limit); | 55 | extern void __init lmb_enforce_memory_limit(u64 memory_limit); |
| 56 | extern int __init lmb_is_reserved(u64 addr); | 56 | extern int __init lmb_is_reserved(u64 addr); |
| 57 | extern int lmb_is_region_reserved(u64 base, u64 size); | ||
| 57 | extern int lmb_find(struct lmb_property *res); | 58 | extern int lmb_find(struct lmb_property *res); |
| 58 | 59 | ||
| 59 | extern void lmb_dump_all(void); | 60 | extern void lmb_dump_all(void); |