a9772285a7
commit d15155824c upstream.
linux/compiler.h is included indirectly by linux/types.h via
uapi/linux/types.h -> uapi/linux/posix_types.h -> linux/stddef.h
-> uapi/linux/stddef.h and is needed to provide a proper definition of
offsetof.
Unfortunately, compiler.h requires a definition of
smp_read_barrier_depends() for defining lockless_dereference() and soon
for defining READ_ONCE(), which means that all
users of READ_ONCE() will need to include asm/barrier.h to avoid splats
such as:
In file included from include/uapi/linux/stddef.h:1:0,
from include/linux/stddef.h:4,
from arch/h8300/kernel/asm-offsets.c:11:
include/linux/list.h: In function 'list_empty':
>> include/linux/compiler.h:343:2: error: implicit declaration of function 'smp_read_barrier_depends' [-Werror=implicit-function-declaration]
smp_read_barrier_depends(); /* Enforce dependency ordering from x */ \
^
A better alternative is to include asm/barrier.h in linux/compiler.h,
but this requires a type definition for "bool" on some architectures
(e.g. x86), which is defined later by linux/types.h. Type "bool" is also
used directly in linux/compiler.h, so the whole thing is pretty fragile.
This patch splits compiler.h in two: compiler_types.h contains type
annotations, definitions and the compiler-specific parts, whereas
compiler.h #includes compiler-types.h and additionally defines macros
such as {READ,WRITE.ACCESS}_ONCE().
uapi/linux/stddef.h and linux/linkage.h are then moved over to include
linux/compiler_types.h, which fixes the build for h8 and blackfin.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1508840570-22169-2-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
48 lines
1.3 KiB
Bash
Executable file
48 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
if [ $# -lt 2 ]
|
|
then
|
|
echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]"
|
|
echo
|
|
echo "Prepares kernel header files for use by user space, by removing"
|
|
echo "all compiler.h definitions and #includes, removing any"
|
|
echo "#ifdef __KERNEL__ sections, and putting __underscores__ around"
|
|
echo "asm/inline/volatile keywords."
|
|
echo
|
|
echo "OUTDIR: directory to write each userspace header FILE to."
|
|
echo "SRCDIR: source directory where files are picked."
|
|
echo "FILES: list of header files to operate on."
|
|
|
|
exit 1
|
|
fi
|
|
|
|
# Grab arguments
|
|
|
|
OUTDIR="$1"
|
|
shift
|
|
SRCDIR="$1"
|
|
shift
|
|
|
|
# Iterate through files listed on command line
|
|
|
|
FILE=
|
|
trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed"' EXIT
|
|
for i in "$@"
|
|
do
|
|
FILE="$(basename "$i")"
|
|
sed -r \
|
|
-e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
|
|
-e 's/__attribute_const__([ \t]|$)/\1/g' \
|
|
-e 's@^#include <linux/compiler(|_types).h>@@' \
|
|
-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
|
|
-e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
|
|
-e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
|
|
"$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
|
|
scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
|
|
> "$OUTDIR/$FILE"
|
|
[ $? -gt 1 ] && exit 1
|
|
rm -f "$OUTDIR/$FILE.sed"
|
|
done
|
|
trap - EXIT
|