Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

um: use the right ifdef around exports in user_syms.c

... the same one that controls whether elf_aux.o is included into the
build, bringing the vsyscall_e... into it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Al Viro and committed by
Richard Weinberger
c6b17bbd d3985d9a

+1 -3
-2
arch/um/os-Linux/Makefile
··· 13 13 main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \ 14 14 tty.o umid.o util.o 15 15 16 - CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) 17 - 18 16 HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \ 19 17 echo -DHAVE_AIO_ABI ) 20 18 CFLAGS_aio.o += $(HAVE_AIO_ABI)
+1 -1
arch/um/os-Linux/user_syms.c
··· 45 45 extern void truncate64(void) __attribute__((weak)); 46 46 EXPORT_SYMBOL(truncate64); 47 47 48 - #ifdef SUBARCH_i386 48 + #ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA 49 49 EXPORT_SYMBOL(vsyscall_ehdr); 50 50 EXPORT_SYMBOL(vsyscall_end); 51 51 #endif