diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-14 17:26:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-14 17:26:58 -0400 |
| commit | 84d69848c97faab0c25aa2667b273404d2e2a64a (patch) | |
| tree | 594f3fe1b271b5255a1c5281e36f8bf938acd1c0 /arch/x86/um | |
| parent | d4d24d2d0a7ea3b62efd7336bfc2344e29b36bc5 (diff) | |
| parent | 590abbdd273304b55824bcb9ea91840ea375575d (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek:
- EXPORT_SYMBOL for asm source by Al Viro.
This does bring a regression, because genksyms no longer generates
checksums for these symbols (CONFIG_MODVERSIONS). Nick Piggin is
working on a patch to fix this.
Plus, we are talking about functions like strcpy(), which rarely
change prototypes.
- Fixes for PPC fallout of the above by Stephen Rothwell and Nick
Piggin
- fixdep speedup by Alexey Dobriyan.
- preparatory work by Nick Piggin to allow architectures to build with
-ffunction-sections, -fdata-sections and --gc-sections
- CONFIG_THIN_ARCHIVES support by Stephen Rothwell
- fix for filenames with colons in the initramfs source by me.
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (22 commits)
initramfs: Escape colons in depfile
ppc: there is no clear_pages to export
powerpc/64: whitelist unresolved modversions CRCs
kbuild: -ffunction-sections fix for archs with conflicting sections
kbuild: add arch specific post-link Makefile
kbuild: allow archs to select link dead code/data elimination
kbuild: allow architectures to use thin archives instead of ld -r
kbuild: Regenerate genksyms lexer
kbuild: genksyms fix for typeof handling
fixdep: faster CONFIG_ search
ia64: move exports to definitions
sparc32: debride memcpy.S a bit
[sparc] unify 32bit and 64bit string.h
sparc: move exports to definitions
ppc: move exports to definitions
arm: move exports to definitions
s390: move exports to definitions
m68k: move exports to definitions
alpha: move exports to actual definitions
x86: move exports to actual definitions
...
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/um/checksum_32.S | 2 | ||||
| -rw-r--r-- | arch/x86/um/ksyms.c | 13 |
3 files changed, 3 insertions, 14 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index 3ee2bb6b440b..e7e7055a8658 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile | |||
| @@ -8,7 +8,7 @@ else | |||
| 8 | BITS := 64 | 8 | BITS := 64 |
| 9 | endif | 9 | endif |
| 10 | 10 | ||
| 11 | obj-y = bug.o bugs_$(BITS).o delay.o fault.o ksyms.o ldt.o \ | 11 | obj-y = bug.o bugs_$(BITS).o delay.o fault.o ldt.o \ |
| 12 | ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ | 12 | ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ |
| 13 | stub_$(BITS).o stub_segv.o \ | 13 | stub_$(BITS).o stub_segv.o \ |
| 14 | sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \ | 14 | sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \ |
diff --git a/arch/x86/um/checksum_32.S b/arch/x86/um/checksum_32.S index fa4b8b9841ff..b9933eb9274a 100644 --- a/arch/x86/um/checksum_32.S +++ b/arch/x86/um/checksum_32.S | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <asm/errno.h> | 28 | #include <asm/errno.h> |
| 29 | #include <asm/asm.h> | 29 | #include <asm/asm.h> |
| 30 | #include <asm/export.h> | ||
| 30 | 31 | ||
| 31 | /* | 32 | /* |
| 32 | * computes a partial checksum, e.g. for TCP/UDP fragments | 33 | * computes a partial checksum, e.g. for TCP/UDP fragments |
| @@ -214,3 +215,4 @@ csum_partial: | |||
| 214 | ret | 215 | ret |
| 215 | 216 | ||
| 216 | #endif | 217 | #endif |
| 218 | EXPORT_SYMBOL(csum_partial) | ||
diff --git a/arch/x86/um/ksyms.c b/arch/x86/um/ksyms.c deleted file mode 100644 index 2e8f43ec6214..000000000000 --- a/arch/x86/um/ksyms.c +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | #include <linux/module.h> | ||
| 2 | #include <asm/string.h> | ||
| 3 | #include <asm/checksum.h> | ||
| 4 | |||
| 5 | #ifndef CONFIG_X86_32 | ||
| 6 | /*XXX: we need them because they would be exported by x86_64 */ | ||
| 7 | #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 | ||
| 8 | EXPORT_SYMBOL(memcpy); | ||
| 9 | #else | ||
| 10 | EXPORT_SYMBOL(__memcpy); | ||
| 11 | #endif | ||
| 12 | #endif | ||
| 13 | EXPORT_SYMBOL(csum_partial); | ||