diff options
author | Joe Perches <joe@perches.com> | 2014-10-31 13:50:46 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2014-11-11 15:51:42 -0500 |
commit | f47436734dc89ece62654d4db8d08163a89dd7ca (patch) | |
tree | 1977a1e352588c026c87cc1fc34c93fabba6f2b7 /arch/tile/kernel/module.c | |
parent | ebd25caf7d511312d1a9724ab5752e9e661dfe60 (diff) |
tile: Use the more common pr_warn instead of pr_warning
And other message logging neatening.
Other miscellanea:
o coalesce formats
o realign arguments
o standardize a couple of macros
o use __func__ instead of embedding the function name
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel/module.c')
-rw-r--r-- | arch/tile/kernel/module.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c index d19b13e3a59f..96447c9160a0 100644 --- a/arch/tile/kernel/module.c +++ b/arch/tile/kernel/module.c | |||
@@ -96,8 +96,8 @@ void module_free(struct module *mod, void *module_region) | |||
96 | static int validate_hw2_last(long value, struct module *me) | 96 | static int validate_hw2_last(long value, struct module *me) |
97 | { | 97 | { |
98 | if (((value << 16) >> 16) != value) { | 98 | if (((value << 16) >> 16) != value) { |
99 | pr_warning("module %s: Out of range HW2_LAST value %#lx\n", | 99 | pr_warn("module %s: Out of range HW2_LAST value %#lx\n", |
100 | me->name, value); | 100 | me->name, value); |
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | return 1; | 103 | return 1; |
@@ -210,10 +210,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, | |||
210 | value -= (unsigned long) location; /* pc-relative */ | 210 | value -= (unsigned long) location; /* pc-relative */ |
211 | value = (long) value >> 3; /* count by instrs */ | 211 | value = (long) value >> 3; /* count by instrs */ |
212 | if (!validate_jumpoff(value)) { | 212 | if (!validate_jumpoff(value)) { |
213 | pr_warning("module %s: Out of range jump to" | 213 | pr_warn("module %s: Out of range jump to %#llx at %#llx (%p)\n", |
214 | " %#llx at %#llx (%p)\n", me->name, | 214 | me->name, |
215 | sym->st_value + rel[i].r_addend, | 215 | sym->st_value + rel[i].r_addend, |
216 | rel[i].r_offset, location); | 216 | rel[i].r_offset, location); |
217 | return -ENOEXEC; | 217 | return -ENOEXEC; |
218 | } | 218 | } |
219 | MUNGE(create_JumpOff_X1); | 219 | MUNGE(create_JumpOff_X1); |