Patches contributed by Eötvös Lorand University
commit c7a27aa4652c63172489a73f3961455650a79a7f
Merge: 63e6be6d98e1 bb7ab785ad05
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Sep 27 09:48:44 2010 +0200
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
commit 7329cf0201f48695862e334828a108aa7175e955
Merge: 74b3c444a963 04e0463e088b
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Sep 24 11:19:53 2010 +0200
Merge branch 'amd-iommu/2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
commit d6dad199a10423ce37b8bfec1f055c380dc4a3d5
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Sep 24 09:12:25 2010 +0200
jump label: Fix GCC feature check when distcc is used
The following build bug occurs on distcc builds:
CC arch/x86/kernel/asm-offsets.s
In file included from include/linux/module.h:24,
from include/linux/crypto.h:22,
from arch/x86/kernel/asm-offsets_64.c:9,
from arch/x86/kernel/asm-offsets.c:5:
include/trace/events/module.h: In function 'trace_module_load':
include/trace/events/module.h:18: error: expected '(' before 'goto'
include/trace/events/module.h:18: error: expected identifier or '*' before '(' token
It triggers because distcc is invoked by turning $CC into "distcc gcc",
but gcc-goto.sh check script was using $1 not $@ to expand parameters.
Cc: Jason Baron <jbaron@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20100923034910.867858597@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh
index 8e82424be7aa..520d16b1ffaf 100644
--- a/scripts/gcc-goto.sh
+++ b/scripts/gcc-goto.sh
@@ -2,4 +2,4 @@
# Test for gcc 'asm goto' suport
# Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
-echo "int main(void) { entry: asm goto (\"\"::::entry); return 0; }" | $1 -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+echo "int main(void) { entry: asm goto (\"\"::::entry); return 0; }" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
commit a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f
Merge: d0303d71c2fb 46eb3b64dddd
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Sep 24 09:12:05 2010 +0200
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6
Merge: 90edf27fb892 c79bd8928213
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Sep 23 08:02:09 2010 +0200
Merge branch 'linus' into perf/core
Conflicts:
arch/sparc/kernel/perf_event.c
Merge reason: Resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/sparc/kernel/perf_event.c
index f9a706759364,6318e622cfb0..0d6deb55a2ae
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@@ -1073,16 -1047,18 +1073,27 @@@ static int sparc_pmu_event_init(struct
pmap = sparc_map_cache_event(attr->config);
if (IS_ERR(pmap))
return PTR_ERR(pmap);
- } else if (attr->type != PERF_TYPE_RAW)
- return -EOPNOTSUPP;
+ break;
+
+ case PERF_TYPE_RAW:
- return -EOPNOTSUPP;
++ pmap = NULL;
++ break;
+
+ default:
+ return -ENOENT;
+
+ }
+ if (pmap) {
+ hwc->event_base = perf_event_encode(pmap);
+ } else {
- /* User gives us "(encoding << 16) | pic_mask" for
++ /*
++ * User gives us "(encoding << 16) | pic_mask" for
+ * PERF_TYPE_RAW events.
+ */
+ hwc->event_base = attr->config;
+ }
+
/* We save the enable bits in the config_base. */
hwc->config_base = sparc_pmu->irq_bit;
if (!attr->exclude_user)
commit 90edf27fb89241917e91155bfdcc7c8e5a587222
Merge: 41945f6ccf1e 8b15575cae7a
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Sep 22 18:45:01 2010 +0200
Merge branch 'linus' into perf/core
Conflicts:
kernel/hw_breakpoint.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit cf84fd96323633be7d437e1de4505fc82ff2c11a
Merge: 31915ab4cbf5 b30a3f6257ed
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Sep 21 13:56:43 2010 +0200
Merge commit 'v2.6.36-rc5' into sched/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 7ed569206ebe7467b9c912b857ec46cf1c361111
Merge: e9d2b064149f b30a3f6257ed
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Sep 21 13:55:04 2010 +0200
Merge commit 'v2.6.36-rc5' into perf/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 0d2b54904d8db26663117ab82697cae5cdf56f72
Merge: 05ed160e89ba c33f543d3208
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Sep 16 16:36:19 2010 +0200
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
commit 3aabae7d9dfaed60effe93662f02c19bafc18537
Merge: 79e406d7b00a 57c072c7113f
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Sep 15 10:27:31 2010 +0200
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core