Patches contributed by Eötvös Lorand University
commit 61405fea92c42d072d9b8bd189689f1502a838af
Merge: 9c443dfdd31e 1703f2c321a8
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jan 13 09:58:37 2010 +0100
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit ff2576674c19c4b74acc4f6cc9bac3b94916350b
Merge: 2c1f1895ef2a 0e1ff5d72a63
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jan 7 10:26:22 2010 +0100
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
commit a8fe9ea200ea21421ea750423d1d4d4f7ce037cf
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 31 15:16:23 2009 +0100
dma-debug: Fix bug causing build warning
Stephen Rothwell reported the following build warning:
lib/dma-debug.c: In function 'dma_debug_device_change':
lib/dma-debug.c:680: warning: 'return' with no value, in function returning non-void
Introduced by commit f797d9881b62c2ddb1d2e7bd80d87141949c84aa
("dma-debug: Do not add notifier when dma debugging is disabled").
Return 0 [notify-done] when disabled. (this is standard bus notifier behavior.)
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <stable@kernel.org>
LKML-Reference: <20091231125624.GA14666@liondog.tnic>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 739974460c32..cf906201aecf 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -670,14 +670,13 @@ static int device_dma_allocations(struct device *dev)
return count;
}
-static int dma_debug_device_change(struct notifier_block *nb,
- unsigned long action, void *data)
+static int dma_debug_device_change(struct notifier_block *nb, unsigned long action, void *data)
{
struct device *dev = data;
int count;
if (global_disable)
- return;
+ return 0;
switch (action) {
case BUS_NOTIFY_UNBOUND_DRIVER:
commit 27d0567ab635bc2af11be48f91c8d5a7a2dca2e4
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 17 08:50:25 2009 +0100
ACPI: fix ACPI=n allmodconfig build
Today's -tip failed to build because commit
9e368fa011d4e0aa050db348d69514900520e40b ("ipmi: add PNP discovery (ACPI
namespace via PNPACPI)") from today's upstream kernel causes the following
build failure on x86, for CONFIG_ACPI=n && CONFIG_IPMI_SI=y:
drivers/char/ipmi/ipmi_si_intf.c:3208: error: 'ipmi_pnp_driver' undeclared (first use in this function)
drivers/char/ipmi/ipmi_si_intf.c:3208: error: (Each undeclared identifier is reported only once
drivers/char/ipmi/ipmi_si_intf.c:3208: error: for each function it appears in.)
drivers/char/ipmi/ipmi_si_intf.c:3334: error: 'ipmi_pnp_driver' undeclared (first use in this function)
The reason is that the ipmi_pnp_driver depends on ACPI facilities and is only
made available under ACPI - while the registration and unregistration is made
dependent on CONFIG_PNP:
#ifdef CONFIG_PNP
pnp_register_driver(&ipmi_pnp_driver);
#endif
The solution is to only register this driver under ACPI. (Also, the CONFIG_PNP
dependency is not needed because pnp_register_driver() is stubbed out in the
!CONFIG_PNP case.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Myron Stowe <myron.stowe@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 679cd08b80b4..176f1751237f 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -3204,7 +3204,7 @@ static __devinit int init_ipmi_si(void)
#ifdef CONFIG_ACPI
spmi_find_bmc();
#endif
-#ifdef CONFIG_PNP
+#ifdef CONFIG_ACPI
pnp_register_driver(&ipmi_pnp_driver);
#endif
@@ -3330,7 +3330,7 @@ static __exit void cleanup_ipmi_si(void)
#ifdef CONFIG_PCI
pci_unregister_driver(&ipmi_pci_driver);
#endif
-#ifdef CONFIG_PNP
+#ifdef CONFIG_ACPI
pnp_unregister_driver(&ipmi_pnp_driver);
#endif
commit 605c1a187f3ce82fbc243e2163c5ca8d1926df8e
Merge: 17a2a9b57a9a ce9277fb08e6
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Dec 28 09:23:13 2009 +0100
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
diff --cc arch/x86/lib/Makefile
index 706be8bf967b,45b20e486c2f..cffd754f3039
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@@ -20,9 -20,9 +20,9 @@@ lib-y := delay.
lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o getuser.o putuser.o
lib-y += memcpy_$(BITS).o
- lib-y += insn.o inat.o
+ lib-$(CONFIG_KPROBES) += insn.o inat.o
-obj-y += msr-reg.o msr-reg-export.o
+obj-y += msr.o msr-reg.o msr-reg-export.o
ifeq ($(CONFIG_X86_32),y)
obj-y += atomic64_32.o
commit 416eb39556a03d1c7e52b0791e9052ccd71db241
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 17 06:05:49 2009 +0100
sched: Make warning less noisy
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <20091216170517.807938893@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/sched.c b/kernel/sched.c
index 8a2bfd37ab4f..af7dfa74e6bb 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2041,7 +2041,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
* We should never call set_task_cpu() on a blocked task,
* ttwu() will sort out the placement.
*/
- WARN_ON(p->state != TASK_RUNNING && p->state != TASK_WAKING);
+ WARN_ON_ONCE(p->state != TASK_RUNNING && p->state != TASK_WAKING);
#endif
trace_sched_migrate_task(p, new_cpu);
commit ee1156c11a1121e118b0a7f2dec240f0d421b1fd
Merge: b9f8fcd55bbd 8bea8672edfc
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 16 18:33:49 2009 +0100
Merge branch 'linus' into sched/urgent
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc kernel/sched_idletask.c
index b810e22772d5,5f93b570d383..21b969a28725
--- a/kernel/sched_idletask.c
+++ b/kernel/sched_idletask.c
@@@ -34,10 -34,10 +34,10 @@@ static struct task_struct *pick_next_ta
static void
dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep)
{
- spin_unlock_irq(&rq->lock);
+ raw_spin_unlock_irq(&rq->lock);
- printk(KERN_ERR "bad: scheduling from the idle thread!\n");
+ pr_err("bad: scheduling from the idle thread!\n");
dump_stack();
- spin_lock_irq(&rq->lock);
+ raw_spin_lock_irq(&rq->lock);
}
static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
commit bf08b3b1a1d06e92036a0c4f144b64fe6be2bffa
Merge: ab1eebe77dd0 6ac5c5310ca9
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Dec 15 20:33:51 2009 +0100
Merge branch 'x86/mce' into x86/urgent
Merge reason: Leftover mini-topic from the merge window - merge it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit ab1eebe77dd08b26585860d534e07810d1cd274d
Merge: 186a25026c44 df59e7bf4399
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Dec 15 20:33:22 2009 +0100
Merge branch 'x86/asm' into x86/urgent
Merge reason: it's stable so lets push it upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d30531c67210f4c73d0f9661998ceeebb0a230ee
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Dec 15 10:24:08 2009 +0100
perf diff: Improve the help text
Fix the short line displayed by 'perf' and also fix some other
details in the longer text.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/tools/perf/Documentation/perf-diff.txt b/tools/perf/Documentation/perf-diff.txt
index bd1ee55cef6a..b7c393bf9ec1 100644
--- a/tools/perf/Documentation/perf-diff.txt
+++ b/tools/perf/Documentation/perf-diff.txt
@@ -3,7 +3,7 @@ perf-diff(1)
NAME
----
-perf-diff - Read perf.data (created by perf record) and display the profile
+perf-diff - Read two perf.data files and display the differential profile
SYNOPSIS
--------
@@ -12,7 +12,7 @@ SYNOPSIS
DESCRIPTION
-----------
-This command displays the performance difference among two perf.data files
+This command displays the performance difference amongst two perf.data files
captured via perf record.
If no parameters are passed it will assume perf.data.old and perf.data.
@@ -21,10 +21,10 @@ OPTIONS
-------
-p::
--percentage::
- Show percentages instead of raw counters
+ Show percentages instead of raw counts
-v::
--verbose::
- Be verbose, for instance, show the raw counters in addition to the
+ Be verbose, for instance, show the raw counts in addition to the
diff.
SEE ALSO
--------