Skip to content

Commit 2aab34f

Browse files
committed
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
2 parents f56caed + a59466e commit 2aab34f

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

include/linux/memblock.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0-or-later */
22
#ifndef _LINUX_MEMBLOCK_H
33
#define _LINUX_MEMBLOCK_H
4-
#ifdef __KERNEL__
54

65
/*
76
* Logical memory blocks.
@@ -605,6 +604,5 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end)
605604
}
606605
#endif
607606

608-
#endif /* __KERNEL__ */
609607

610608
#endif /* _LINUX_MEMBLOCK_H */

0 commit comments

Comments
 (0)