Commit 2aab34f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'memblock-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock 

Pull memblock cleanup from Mike Rapoport:
 "Remove #ifdef __KERNEL__ from memblock.h

  memblock.h is not a uAPI header, so __KERNEL__ guard can be deleted"

* tag 'memblock-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: Remove #ifdef __KERNEL__ from memblock.h
parents f56caeda a59466ee

include/linux/memblock.h

+0 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _LINUX_MEMBLOCK_H

#define _LINUX_MEMBLOCK_H

#ifdef __KERNEL__



/*

 * Logical memory blocks.
@@ -605,6 +604,5 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end) 
}

#endif



#endif /* __KERNEL__ */



#endif /* _LINUX_MEMBLOCK_H */