diff options
| author | Alexander Graf <agraf@suse.de> | 2013-08-28 18:41:59 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-28 18:41:59 -0400 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /include/linux/bootmem.h | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc (diff) | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 (diff) | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'include/linux/bootmem.h')
| -rw-r--r-- | include/linux/bootmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 5f0b0e1f7c08..f1f07d31a3af 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -44,8 +44,8 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat, | |||
| 44 | unsigned long endpfn); | 44 | unsigned long endpfn); |
| 45 | extern unsigned long init_bootmem(unsigned long addr, unsigned long memend); | 45 | extern unsigned long init_bootmem(unsigned long addr, unsigned long memend); |
| 46 | 46 | ||
| 47 | extern unsigned long free_all_bootmem_node(pg_data_t *pgdat); | ||
| 48 | extern unsigned long free_all_bootmem(void); | 47 | extern unsigned long free_all_bootmem(void); |
| 48 | extern void reset_all_zones_managed_pages(void); | ||
| 49 | 49 | ||
| 50 | extern void free_bootmem_node(pg_data_t *pgdat, | 50 | extern void free_bootmem_node(pg_data_t *pgdat, |
| 51 | unsigned long addr, | 51 | unsigned long addr, |