Patches contributed by Eötvös Lorand University
commit 7c46d8da09df22361d1d43465c4f1b06cecaf25f
Merge: acac03fa15a8 7f85803a26f3
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jan 15 15:23:27 2011 +0100
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit 1161ec944916069ceec21c487e30247d9ff22857
Merge: f123c98e7f16 b24efdfdf679
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jan 14 15:30:16 2011 +0100
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
commit 9adcc4a127be6c979eae1ae34083261f2ec5dfec
Merge: 30285c6f03be d906f0eb2f0e
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jan 10 09:35:57 2011 +0100
Merge branch 'x86/numa' into x86/urgent
Merge reason: Topic is ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 30285c6f03be05f6f894b50d03bcb638886e3936
Merge: 91d88ce22bca 1c2a48cf6558
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jan 10 09:34:42 2011 +0100
Merge branch 'x86/apic-cleanups' into x86/urgent
Merge reason: Topic is ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 4385428a477559b26736cc3c80d8b68f31126c71
Merge: 047a3772feaa 2d75af2f2a7a
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 9 10:42:21 2011 +0100
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit 1c2a48cf65580a276552151eb8f78d78c55b828e
Merge: 0aa002fe6029 cb600d2f83c8
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jan 7 14:14:15 2011 +0100
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/kernel/acpi/boot.c
index 1a5b9a8e6c4f,17c8090fabd4..ec881c6bfee0
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -895,10 -912,10 +900,10 @@@ static int __init acpi_parse_madt_lapic
return count;
}
- acpi_register_lapic_address(acpi_lapic_addr);
+ register_lapic_address(acpi_lapic_addr);
count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC,
- acpi_parse_sapic, MAX_APICS);
+ acpi_parse_sapic, MAX_LOCAL_APIC);
if (!count) {
x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC,
commit aef1b9cef78ae65c6501850851cc3f61f9be477b
Merge: 20c457b8587b 3c0eee3fe6a3
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jan 5 14:22:08 2011 +0100
Merge commit 'v2.6.37' into perf/core
Merge reason: Add the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 27066fd484a32c80630136aa2b91c980f3198f9d
Merge: 101e5f77bf35 3c0eee3fe6a3
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jan 5 14:14:42 2011 +0100
Merge commit 'v2.6.37' into sched/core
Merge reason: Merge the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit bc030d6cb9532877c1c5a3f5e7123344fa24a285
Merge: d3bd058826aa 387c31c7e5c9
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jan 4 09:43:42 2011 +0100
Merge commit 'v2.6.37-rc8' into x86/apic
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/include/asm/io_apic.h
index d7d46cb53e52,a6b28d017c2f..0c5ca4e30d7b
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@@ -168,8 -168,10 +168,9 @@@ extern int save_IO_APIC_setup(struct IO
extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
-extern void probe_nr_irqs_gsi(void);
+ extern int get_nr_irqs_gsi(void);
-
extern void setup_ioapic_ids_from_mpc(void);
+extern void setup_ioapic_ids_from_mpc_nocheck(void);
struct mp_ioapic_gsi{
u32 gsi_base;
commit 928585536ff5a8f320e60efc60e2b7ef2a5f548d
Merge: cc2221969906 d854861c4292
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jan 4 08:10:28 2011 +0100
Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core