aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/bootmem.h
diff options
context:
space:
mode:
authorMike Rapoport <rppt@linux.vnet.ibm.com>2018-10-30 18:09:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-31 11:54:16 -0400
commit57c8a661d95dff48dd9c2f2496139082bbaf241a (patch)
treea4d49d0232149047f9c0032e22b7fa779e75d61f /include/linux/bootmem.h
parent97ad1087efffed26cb00e310a927f9603332dfcb (diff)
mm: remove include/linux/bootmem.h
Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/bootmem.h')
-rw-r--r--include/linux/bootmem.h173
1 files changed, 0 insertions, 173 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
deleted file mode 100644
index b58873a567b2..000000000000
--- a/include/linux/bootmem.h
+++ /dev/null
@@ -1,173 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2/*
3 * Discontiguous memory support, Kanoj Sarcar, SGI, Nov 1999
4 */
5#ifndef _LINUX_BOOTMEM_H
6#define _LINUX_BOOTMEM_H
7
8#include <linux/mmzone.h>
9#include <linux/mm_types.h>
10#include <asm/dma.h>
11#include <asm/processor.h>
12
13/*
14 * simple boot-time physical memory area allocator.
15 */
16
17extern unsigned long max_low_pfn;
18extern unsigned long min_low_pfn;
19
20/*
21 * highest page
22 */
23extern unsigned long max_pfn;
24/*
25 * highest possible page
26 */
27extern unsigned long long max_possible_pfn;
28
29extern unsigned long memblock_free_all(void);
30extern void reset_node_managed_pages(pg_data_t *pgdat);
31extern void reset_all_zones_managed_pages(void);
32
33/* We are using top down, so it is safe to use 0 here */
34#define BOOTMEM_LOW_LIMIT 0
35
36#ifndef ARCH_LOW_ADDRESS_LIMIT
37#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
38#endif
39
40/* FIXME: use MEMBLOCK_ALLOC_* variants here */
41#define BOOTMEM_ALLOC_ACCESSIBLE 0
42#define BOOTMEM_ALLOC_ANYWHERE (~(phys_addr_t)0)
43
44/* FIXME: Move to memblock.h at a point where we remove nobootmem.c */
45void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
46 phys_addr_t min_addr,
47 phys_addr_t max_addr, int nid);
48void *memblock_alloc_try_nid_nopanic(phys_addr_t size,
49 phys_addr_t align, phys_addr_t min_addr,
50 phys_addr_t max_addr, int nid);
51void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
52 phys_addr_t min_addr, phys_addr_t max_addr, int nid);
53void __memblock_free_early(phys_addr_t base, phys_addr_t size);
54void __memblock_free_late(phys_addr_t base, phys_addr_t size);
55
56static inline void * __init memblock_alloc(
57 phys_addr_t size, phys_addr_t align)
58{
59 return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
60 BOOTMEM_ALLOC_ACCESSIBLE,
61 NUMA_NO_NODE);
62}
63
64static inline void * __init memblock_alloc_raw(
65 phys_addr_t size, phys_addr_t align)
66{
67 return memblock_alloc_try_nid_raw(size, align, BOOTMEM_LOW_LIMIT,
68 BOOTMEM_ALLOC_ACCESSIBLE,
69 NUMA_NO_NODE);
70}
71
72static inline void * __init memblock_alloc_from(
73 phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
74{
75 return memblock_alloc_try_nid(size, align, min_addr,
76 BOOTMEM_ALLOC_ACCESSIBLE,
77 NUMA_NO_NODE);
78}
79
80static inline void * __init memblock_alloc_nopanic(
81 phys_addr_t size, phys_addr_t align)
82{
83 return memblock_alloc_try_nid_nopanic(size, align,
84 BOOTMEM_LOW_LIMIT,
85 BOOTMEM_ALLOC_ACCESSIBLE,
86 NUMA_NO_NODE);
87}
88
89static inline void * __init memblock_alloc_low(
90 phys_addr_t size, phys_addr_t align)
91{
92 return memblock_alloc_try_nid(size, align,
93 BOOTMEM_LOW_LIMIT,
94 ARCH_LOW_ADDRESS_LIMIT,
95 NUMA_NO_NODE);
96}
97static inline void * __init memblock_alloc_low_nopanic(
98 phys_addr_t size, phys_addr_t align)
99{
100 return memblock_alloc_try_nid_nopanic(size, align,
101 BOOTMEM_LOW_LIMIT,
102 ARCH_LOW_ADDRESS_LIMIT,
103 NUMA_NO_NODE);
104}
105
106static inline void * __init memblock_alloc_from_nopanic(
107 phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
108{
109 return memblock_alloc_try_nid_nopanic(size, align, min_addr,
110 BOOTMEM_ALLOC_ACCESSIBLE,
111 NUMA_NO_NODE);
112}
113
114static inline void * __init memblock_alloc_node(
115 phys_addr_t size, phys_addr_t align, int nid)
116{
117 return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
118 BOOTMEM_ALLOC_ACCESSIBLE, nid);
119}
120
121static inline void * __init memblock_alloc_node_nopanic(
122 phys_addr_t size, int nid)
123{
124 return memblock_alloc_try_nid_nopanic(size, 0, BOOTMEM_LOW_LIMIT,
125 BOOTMEM_ALLOC_ACCESSIBLE,
126 nid);
127}
128
129static inline void __init memblock_free_early(
130 phys_addr_t base, phys_addr_t size)
131{
132 __memblock_free_early(base, size);
133}
134
135static inline void __init memblock_free_early_nid(
136 phys_addr_t base, phys_addr_t size, int nid)
137{
138 __memblock_free_early(base, size);
139}
140
141static inline void __init memblock_free_late(
142 phys_addr_t base, phys_addr_t size)
143{
144 __memblock_free_late(base, size);
145}
146
147extern void *alloc_large_system_hash(const char *tablename,
148 unsigned long bucketsize,
149 unsigned long numentries,
150 int scale,
151 int flags,
152 unsigned int *_hash_shift,
153 unsigned int *_hash_mask,
154 unsigned long low_limit,
155 unsigned long high_limit);
156
157#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
158#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min
159 * shift passed via *_hash_shift */
160#define HASH_ZERO 0x00000004 /* Zero allocated hash table */
161
162/* Only NUMA needs hash distribution. 64bit NUMA architectures have
163 * sufficient vmalloc space.
164 */
165#ifdef CONFIG_NUMA
166#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
167extern int hashdist; /* Distribute hashes across NUMA nodes? */
168#else
169#define hashdist (0)
170#endif
171
172
173#endif /* _LINUX_BOOTMEM_H */