releases/2.6.32.12/x86-fix-breakage-of-uml-from-the-changes-in-the-rwsem-system.patch

   1 From 4126faf0ab7417fbc6eb99fb0fd407e01e9e9dfe Mon Sep 17 00:00:00 2001
   2 From: Linus Torvalds <torvalds@linux-foundation.org>
   3 Date: Sun, 17 Jan 2010 10:24:07 -0800
   4 Subject: x86: Fix breakage of UML from the changes in the rwsem system
   5
   6 From: Linus Torvalds <torvalds@linux-foundation.org>
   7
   8 commit 4126faf0ab7417fbc6eb99fb0fd407e01e9e9dfe upstream.
   9
  10 The patches 5d0b7235d83eefdafda300656e97d368afcafc9a and
  11 bafaecd11df15ad5b1e598adc7736afcd38ee13d broke the UML build:
  12
  13 On Sun, 17 Jan 2010, Ingo Molnar wrote:
  14 >
  15 > FYI, -tip testing found that these changes break the UML build:
  16 >
  17 > kernel/built-in.o: In function `__up_read':
  18 > /home/mingo/tip/arch/x86/include/asm/rwsem.h:192: undefined reference to `call_rwsem_wake'
  19 > kernel/built-in.o: In function `__up_write':
  20 > /home/mingo/tip/arch/x86/include/asm/rwsem.h:210: undefined reference to `call_rwsem_wake'
  21 > kernel/built-in.o: In function `__downgrade_write':
  22 > /home/mingo/tip/arch/x86/include/asm/rwsem.h:228: undefined reference to `call_rwsem_downgrade_wake'
  23 > kernel/built-in.o: In function `__down_read':
  24 > /home/mingo/tip/arch/x86/include/asm/rwsem.h:112: undefined reference to `call_rwsem_down_read_failed'
  25 > kernel/built-in.o: In function `__down_write_nested':
  26 > /home/mingo/tip/arch/x86/include/asm/rwsem.h:154: undefined reference to `call_rwsem_down_write_failed'
  27 > collect2: ld returned 1 exit status
  28
  29 Add lib/rwsem_64.o to the UML subarch objects to fix.
  30
  31 LKML-Reference: <alpine.LFD.2.00.1001171023440.13231@localhost.localdomain>
  32 Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  33 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  34
  35 ---
  36  arch/um/sys-x86_64/Makefile |    3 ++-
  37  1 file changed, 2 insertions(+), 1 deletion(-)
  38
  39 --- a/arch/um/sys-x86_64/Makefile
  40 +++ b/arch/um/sys-x86_64/Makefile
  41 @@ -8,7 +8,8 @@ obj-y = bug.o bugs.o delay.o fault.o ldt
  42         setjmp.o signal.o stub.o stub_segv.o syscalls.o syscall_table.o \
  43         sysrq.o ksyms.o tls.o
  44
  45 -subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o
  46 +subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o \
  47 +               lib/rwsem_64.o
  48  subarch-obj-$(CONFIG_MODULES) += kernel/module.o
  49
  50  ldt-y = ../sys-i386/ldt.o