summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77a0dd5 3fb82d5 fd35fbc 9e76a97 c8217b8 3cf9b85 f6cd247)
raw | combined (merge: 77a0dd5 3fb82d5 fd35fbc 9e76a97 c8217b8 3cf9b85 f6cd247)
author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 6 Jan 2011 19:11:50 +0000 (11:11 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 6 Jan 2011 19:11:50 +0000 (11:11 -0800) |
* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, asm: Use fxsaveq/fxrestorq in more places
* 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hwmon: Add core threshold notification to therm_throt.c
* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, paravirt: Use native_halt on a halt, not native_safe_halt
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
locking, lockdep: Convert sprintf_symbol to %pS
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
irq: Better struct irqaction layout
x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, asm: Use fxsaveq/fxrestorq in more places
* 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hwmon: Add core threshold notification to therm_throt.c
* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, paravirt: Use native_halt on a halt, not native_safe_halt
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
locking, lockdep: Convert sprintf_symbol to %pS
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
irq: Better struct irqaction layout
1 | 2 | 3 | 4 | 5 | 6 | 7 | |||
---|---|---|---|---|---|---|---|---|---|
arch/x86/include/asm/alternative.h | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | blob | history |
arch/x86/include/asm/msr-index.h | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | blob | history |
arch/x86/kernel/alternative.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | blob | history |
arch/x86/kernel/smpboot.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | blob | history |
kernel/cpu.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | blob | history |
diff --cc arch/x86/include/asm/alternative.h
Simple merge
diff --cc arch/x86/include/asm/msr-index.h
index 86030f63ba02cf0947920a2bdd35a1f0d13ea833,6b89f5e860214266d7270160f739e9a9be290802,986f7790fdb2880c4f9efda864a489a0edb83892,622c80b7dbee2aad4f2cbf20a121fbe3a10f2956,6b89f5e860214266d7270160f739e9a9be290802,3ea3dc4870474bdbbb7d0a14e1c43e52c428ddd4,3ea3dc4870474bdbbb7d0a14e1c43e52c428ddd4..4d0dfa0d998e9f80ce244d86e1fd583513aaaaca
#define MSR_AMD64_IBSDCLINAD 0xc0011038
#define MSR_AMD64_IBSDCPHYSAD 0xc0011039
#define MSR_AMD64_IBSCTL 0xc001103a
+ #define MSR_AMD64_IBSBRTARGET 0xc001103b
+
++++++/* Fam 15h MSRs */
++++++#define MSR_F15H_PERF_CTL 0xc0010200
++++++#define MSR_F15H_PERF_CTR 0xc0010201
+ ++++
/* Fam 10h MSRs */
#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058
#define FAM10H_MMIO_CONF_ENABLE (1<<0)
diff --cc arch/x86/kernel/alternative.c
index 553d0b0d639bf4b8ef1eca720e7fe43f0fa1e662,9f98eb400fefa9c238822cc3b1ea92ded788e0e1,a36bb90aef5383d68bcf4af0b0c33749d572163a,5079f24c955a2d3b9b66532cd2c8cd45e5116d14,5079f24c955a2d3b9b66532cd2c8cd45e5116d14,5079f24c955a2d3b9b66532cd2c8cd45e5116d14,5079f24c955a2d3b9b66532cd2c8cd45e5116d14..123608531c8f933b819a3fc7c135748137c8eb5b
@@@@@@@@ -653,33 -643,13 -642,9 -642,13 -642,13 -642,13 -642,13 +654,33 @@@@@@@@ void *__kprobes text_poke_smp(void *add
return addr;
}
++++++/**
++++++ * text_poke_smp_batch - Update instructions on a live kernel on SMP
++++++ * @params: an array of text_poke parameters
++++++ * @n: the number of elements in params.
++++++ *
++++++ * Modify multi-byte instruction by using stop_machine() on SMP. Since the
++++++ * stop_machine() is heavy task, it is better to aggregate text_poke requests
++++++ * and do it once if possible.
++++++ *
++++++ * Note: Must be called under get_online_cpus() and text_mutex.
++++++ */
++++++void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n)
++++++{
++++++ struct text_poke_params tpp = {.params = params, .nparams = n};
++++++
++++++ atomic_set(&stop_machine_first, 1);
++++++ wrote_text = 0;
++++++ stop_machine(stop_machine_text_poke, (void *)&tpp, NULL);
++++++}
++++++
#if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
- unsigned char ideal_nop5[IDEAL_NOP_SIZE_5];
+ #ifdef CONFIG_X86_64
+ unsigned char ideal_nop5[5] = { 0x66, 0x66, 0x66, 0x66, 0x90 };
+ #else
+ unsigned char ideal_nop5[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
+ #endif
void __init arch_init_ideal_nop5(void)
{
diff --cc arch/x86/kernel/smpboot.c
Simple merge
diff --cc kernel/cpu.c
Simple merge