diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-09 23:38:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-09 23:38:02 -0400 |
| commit | 3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14 (patch) | |
| tree | 02e95f15bd8a04071a9a36f534a92a066a8ce66a /arch/s390/kernel | |
| parent | 8ac467e837a24eb024177b4b01013d8e6764913a (diff) | |
| parent | affb8172de395a6e1db52ed9790ca0456d8c29a9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cadence/macb.c
Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/jump_label.c | 12 | ||||
| -rw-r--r-- | arch/s390/kernel/module.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/processor.c | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/arch/s390/kernel/jump_label.c b/arch/s390/kernel/jump_label.c index cb2d51e779df..830066f936c8 100644 --- a/arch/s390/kernel/jump_label.c +++ b/arch/s390/kernel/jump_label.c | |||
| @@ -36,16 +36,20 @@ static void jump_label_make_branch(struct jump_entry *entry, struct insn *insn) | |||
| 36 | insn->offset = (entry->target - entry->code) >> 1; | 36 | insn->offset = (entry->target - entry->code) >> 1; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | static void jump_label_bug(struct jump_entry *entry, struct insn *insn) | 39 | static void jump_label_bug(struct jump_entry *entry, struct insn *expected, |
| 40 | struct insn *new) | ||
| 40 | { | 41 | { |
| 41 | unsigned char *ipc = (unsigned char *)entry->code; | 42 | unsigned char *ipc = (unsigned char *)entry->code; |
| 42 | unsigned char *ipe = (unsigned char *)insn; | 43 | unsigned char *ipe = (unsigned char *)expected; |
| 44 | unsigned char *ipn = (unsigned char *)new; | ||
| 43 | 45 | ||
| 44 | pr_emerg("Jump label code mismatch at %pS [%p]\n", ipc, ipc); | 46 | pr_emerg("Jump label code mismatch at %pS [%p]\n", ipc, ipc); |
| 45 | pr_emerg("Found: %02x %02x %02x %02x %02x %02x\n", | 47 | pr_emerg("Found: %02x %02x %02x %02x %02x %02x\n", |
| 46 | ipc[0], ipc[1], ipc[2], ipc[3], ipc[4], ipc[5]); | 48 | ipc[0], ipc[1], ipc[2], ipc[3], ipc[4], ipc[5]); |
| 47 | pr_emerg("Expected: %02x %02x %02x %02x %02x %02x\n", | 49 | pr_emerg("Expected: %02x %02x %02x %02x %02x %02x\n", |
| 48 | ipe[0], ipe[1], ipe[2], ipe[3], ipe[4], ipe[5]); | 50 | ipe[0], ipe[1], ipe[2], ipe[3], ipe[4], ipe[5]); |
| 51 | pr_emerg("New: %02x %02x %02x %02x %02x %02x\n", | ||
| 52 | ipn[0], ipn[1], ipn[2], ipn[3], ipn[4], ipn[5]); | ||
| 49 | panic("Corrupted kernel text"); | 53 | panic("Corrupted kernel text"); |
| 50 | } | 54 | } |
| 51 | 55 | ||
| @@ -69,10 +73,10 @@ static void __jump_label_transform(struct jump_entry *entry, | |||
| 69 | } | 73 | } |
| 70 | if (init) { | 74 | if (init) { |
| 71 | if (memcmp((void *)entry->code, &orignop, sizeof(orignop))) | 75 | if (memcmp((void *)entry->code, &orignop, sizeof(orignop))) |
| 72 | jump_label_bug(entry, &old); | 76 | jump_label_bug(entry, &orignop, &new); |
| 73 | } else { | 77 | } else { |
| 74 | if (memcmp((void *)entry->code, &old, sizeof(old))) | 78 | if (memcmp((void *)entry->code, &old, sizeof(old))) |
| 75 | jump_label_bug(entry, &old); | 79 | jump_label_bug(entry, &old, &new); |
| 76 | } | 80 | } |
| 77 | probe_kernel_write((void *)entry->code, &new, sizeof(new)); | 81 | probe_kernel_write((void *)entry->code, &new, sizeof(new)); |
| 78 | } | 82 | } |
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 36154a2f1814..2ca95862e336 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c | |||
| @@ -436,6 +436,7 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
| 436 | const Elf_Shdr *sechdrs, | 436 | const Elf_Shdr *sechdrs, |
| 437 | struct module *me) | 437 | struct module *me) |
| 438 | { | 438 | { |
| 439 | jump_label_apply_nops(me); | ||
| 439 | vfree(me->arch.syminfo); | 440 | vfree(me->arch.syminfo); |
| 440 | me->arch.syminfo = NULL; | 441 | me->arch.syminfo = NULL; |
| 441 | return 0; | 442 | return 0; |
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c index 26108232fcaa..dc488e13b7e3 100644 --- a/arch/s390/kernel/processor.c +++ b/arch/s390/kernel/processor.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | static DEFINE_PER_CPU(struct cpuid, cpu_id); | 19 | static DEFINE_PER_CPU(struct cpuid, cpu_id); |
| 20 | 20 | ||
| 21 | void cpu_relax(void) | 21 | void notrace cpu_relax(void) |
| 22 | { | 22 | { |
| 23 | if (!smp_cpu_mtid && MACHINE_HAS_DIAG44) | 23 | if (!smp_cpu_mtid && MACHINE_HAS_DIAG44) |
| 24 | asm volatile("diag 0,0,0x44"); | 24 | asm volatile("diag 0,0,0x44"); |