diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-16 06:43:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-16 06:43:14 +0200 |
| commit | 2aab34f873cc611cf195231c3738080c8dbda7f3 (patch) | |
| tree | ccaf748a72a519229228e15fe83b7e723d05efcd /include | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | memblock: Remove #ifdef __KERNEL__ from memblock.h (diff) | |
| download | linux-dev-2aab34f873cc611cf195231c3738080c8dbda7f3.tar.xz linux-dev-2aab34f873cc611cf195231c3738080c8dbda7f3.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memblock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 9dc7cb239d21..50ad19662a32 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -1,7 +1,6 @@ /* 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 */ |