diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:41:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:41:35 -0800 |
| commit | d6cd4715e21508bebbb1928c91d628bd65f5de5f (patch) | |
| tree | 2b89de4d36032bdd3d56fbae6e0d626c2cdd38b8 /arch/um | |
| parent | 1eca9acbf9cda6437db7de1097c7a18014b1289d (diff) | |
| parent | 0d1622d7f526311d87d7da2ee7dd14b73e45d3fc (diff) | |
| download | linux-3.10-d6cd4715e21508bebbb1928c91d628bd65f5de5f.tar.gz linux-3.10-d6cd4715e21508bebbb1928c91d628bd65f5de5f.tar.bz2 linux-3.10-d6cd4715e21508bebbb1928c91d628bd65f5de5f.zip | |
Merge branch 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, rwsem: Avoid store forwarding hazard in __downgrade_write
x86-64, rwsem: 64-bit xadd rwsem implementation
x86: Fix breakage of UML from the changes in the rwsem system
x86-64: support native xadd rwsem implementation
x86: clean up rwsem type system
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/sys-x86_64/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index 2201e9c20e4..c1ea9eb0446 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile @@ -8,7 +8,8 @@ obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \ setjmp.o signal.o stub.o stub_segv.o syscalls.o syscall_table.o \ sysrq.o ksyms.o tls.o -subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o +subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o \ + lib/rwsem_64.o subarch-obj-$(CONFIG_MODULES) += kernel/module.o ldt-y = ../sys-i386/ldt.o |