diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-10 19:02:28 -0500 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-03-25 00:29:55 +0100 |
| commit | c6b17bbd39bdb0f110c09675280630fa1a7d25a0 (patch) | |
| tree | 246633774e5093ce9e875f346434000441e73720 /arch/um | |
| parent | d3985d9ac6eeaf447a40d18b78a7e5443f95d790 (diff) | |
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>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/os-Linux/Makefile | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/user_syms.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile index dd764101e488..08ff5094fcdd 100644 --- a/arch/um/os-Linux/Makefile +++ b/arch/um/os-Linux/Makefile @@ -13,8 +13,6 @@ USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \ main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \ tty.o umid.o util.o -CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) - HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \ echo -DHAVE_AIO_ABI ) CFLAGS_aio.o += $(HAVE_AIO_ABI) diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c index 45ffe46871e0..73926fa3f96b 100644 --- a/arch/um/os-Linux/user_syms.c +++ b/arch/um/os-Linux/user_syms.c @@ -45,7 +45,7 @@ EXPORT_SYMBOL(readdir64); extern void truncate64(void) __attribute__((weak)); EXPORT_SYMBOL(truncate64); -#ifdef SUBARCH_i386 +#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA EXPORT_SYMBOL(vsyscall_ehdr); EXPORT_SYMBOL(vsyscall_end); #endif |