From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 05:05:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'uprobes/for-next'
X-Git-Tag: next-20111213~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b6128b5b988f4e4c7e53d85f17fc5a664349e6d;p=karo-tx-linux.git

Merge remote-tracking branch 'uprobes/for-next'
---

2b6128b5b988f4e4c7e53d85f17fc5a664349e6d
diff --cc kernel/Makefile
index f70396e5a24b,9fb670d31e9c..4363a41e1ff4
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -108,7 -109,17 +108,8 @@@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += u
  obj-$(CONFIG_PADATA) += padata.o
  obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
  obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_UPROBES) += uprobes.o
  
 -ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
 -# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
 -# needed for x86 only.  Why this used to be enabled for all architectures is beyond
 -# me.  I suspect most platforms don't need this, but until we know that for sure
 -# I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
 -# to get a correct value for the wait-channel (WCHAN in ps). --davidm
 -CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
 -endif
 -
  $(obj)/configs.o: $(obj)/config_data.h
  
  # config_data.h contains the same information as ikconfig.h but gzipped.