From: tip-bot for Richard Weinberger <richard@nod.at>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
richard@nod.at, sfr@canb.auug.org.au, rdunlap@xenotime.net,
tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/asm] um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM
Date: Fri, 22 Jul 2011 21:39:56 GMT [thread overview]
Message-ID: <tip-a03fc8c375511b6ab43184ab191af3218a919646@git.kernel.org> (raw)
In-Reply-To: <201107222055.35341.richard@nod.at>
Commit-ID: a03fc8c375511b6ab43184ab191af3218a919646
Gitweb: http://git.kernel.org/tip/a03fc8c375511b6ab43184ab191af3218a919646
Author: Richard Weinberger <richard@nod.at>
AuthorDate: Fri, 22 Jul 2011 20:55:34 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 22 Jul 2011 23:06:30 +0200
um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM
rwsem.S can only be used with CONFIG_RWSEM_XCHGADD_ALGORITHM.
This unbreaks the UML build on i386.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: JBeulich@novell.com
Link: http://lkml.kernel.org/r/201107222055.35341.richard@nod.at
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/um/sys-i386/Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 15587ed..87b659d 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -8,7 +8,8 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
obj-$(CONFIG_BINFMT_ELF) += elfcore.o
-subarch-obj-y = lib/rwsem.o lib/string_32.o
+subarch-obj-y = lib/string_32.o
+subarch-obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += lib/rwsem.o
subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
subarch-obj-$(CONFIG_MODULES) += kernel/module.o
next prev parent reply other threads:[~2011-07-22 21:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 6:42 linux-next: Tree for July 22 Stephen Rothwell
2011-07-22 15:53 ` linux-next: Tree for July 22 (uml) Randy Dunlap
2011-07-22 18:55 ` Richard Weinberger
2011-07-22 20:15 ` Randy Dunlap
2011-07-22 21:39 ` tip-bot for Richard Weinberger [this message]
2011-07-25 6:54 ` Jan Beulich
2011-07-22 16:04 ` linux-next: Tree for July 22 (bcma) Randy Dunlap
2011-07-22 16:22 ` linux-next: Tree for July 22 (xen) Randy Dunlap
2011-07-22 17:35 ` Konrad Rzeszutek Wilk
2011-07-22 17:48 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-a03fc8c375511b6ab43184ab191af3218a919646@git.kernel.org \
--to=richard@nod.at \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=rdunlap@xenotime.net \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox