History

memblock: remove memblock_{set,clear}_region_flags

The memblock API provides dedicated helpers to set or clear a flag on a memory region, e.g. memblock_{mark,clear}_hotplug(). The memblock_{set,clear}_region_flags() functions are used only by the memblock internal function that adjusts the region flags. Drop these functions and use open-coded implementation instead.

Mike Rapoport committed 7 years ago

Commit fe145121 parent 26fb3da2 files · +6 −15Browse files

Unified · Split

2 files
  1. include/linux/memblock.h +0 −12
  2. mm/memblock.c +6 −3
include/linux/memblock.h+0−12
@@ -273,18 +273,6 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, · 272 unmodified lines
273 for_each_mem_range_rev(i, &memblock.memory, &memblock.reserved, \273 for_each_mem_range_rev(i, &memblock.memory, &memblock.reserved, \
274 nid, flags, p_start, p_end, p_nid)274 nid, flags, p_start, p_end, p_nid)
275 275
276static inline void memblock_set_region_flags(struct memblock_region *r,
277 enum memblock_flags flags)
278{
279 r->flags |= flags;
280}
281
282static inline void memblock_clear_region_flags(struct memblock_region *r,
283 enum memblock_flags flags)
284{
285 r->flags &= ~flags;
286}
287
288#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP276#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
289int memblock_set_node(phys_addr_t base, phys_addr_t size,277int memblock_set_node(phys_addr_t base, phys_addr_t size,
290 struct memblock_type *type, int nid);278 struct memblock_type *type, int nid);
mm/memblock.c+6−3
@@ -858,11 +858,14 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base, · 857 unmodified lines
858 if (ret)858 if (ret)
859 return ret;859 return ret;
860 860
861 for (i = start_rgn; i < end_rgn; i++)861 for (i = start_rgn; i < end_rgn; i++) {
862 struct memblock_region *r = &type->regions[i];
863
862 if (set)864 if (set)
863 memblock_set_region_flags(&type->regions[i], flag);865 r->flags |= flag;
864 else866 else
865 memblock_clear_region_flags(&type->regions[i], flag);867 r->flags &= ~flag;
868 }
866 869
867 memblock_merge_regions(type);870 memblock_merge_regions(type);
868 return 0;871 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t