diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/list.h | 6 | ||||
-rw-r--r-- | scripts/recordmcount.c | 2 | ||||
-rwxr-xr-x | scripts/recordmcount.pl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h index 685d80e1bb0e..2cf23f002d3f 100644 --- a/scripts/kconfig/list.h +++ b/scripts/kconfig/list.h | |||
@@ -34,7 +34,7 @@ struct list_head { | |||
34 | * list_entry - get the struct for this entry | 34 | * list_entry - get the struct for this entry |
35 | * @ptr: the &struct list_head pointer. | 35 | * @ptr: the &struct list_head pointer. |
36 | * @type: the type of the struct this is embedded in. | 36 | * @type: the type of the struct this is embedded in. |
37 | * @member: the name of the list_struct within the struct. | 37 | * @member: the name of the list_head within the struct. |
38 | */ | 38 | */ |
39 | #define list_entry(ptr, type, member) \ | 39 | #define list_entry(ptr, type, member) \ |
40 | container_of(ptr, type, member) | 40 | container_of(ptr, type, member) |
@@ -43,7 +43,7 @@ struct list_head { | |||
43 | * list_for_each_entry - iterate over list of given type | 43 | * list_for_each_entry - iterate over list of given type |
44 | * @pos: the type * to use as a loop cursor. | 44 | * @pos: the type * to use as a loop cursor. |
45 | * @head: the head for your list. | 45 | * @head: the head for your list. |
46 | * @member: the name of the list_struct within the struct. | 46 | * @member: the name of the list_head within the struct. |
47 | */ | 47 | */ |
48 | #define list_for_each_entry(pos, head, member) \ | 48 | #define list_for_each_entry(pos, head, member) \ |
49 | for (pos = list_entry((head)->next, typeof(*pos), member); \ | 49 | for (pos = list_entry((head)->next, typeof(*pos), member); \ |
@@ -55,7 +55,7 @@ struct list_head { | |||
55 | * @pos: the type * to use as a loop cursor. | 55 | * @pos: the type * to use as a loop cursor. |
56 | * @n: another type * to use as temporary storage | 56 | * @n: another type * to use as temporary storage |
57 | * @head: the head for your list. | 57 | * @head: the head for your list. |
58 | * @member: the name of the list_struct within the struct. | 58 | * @member: the name of the list_head within the struct. |
59 | */ | 59 | */ |
60 | #define list_for_each_entry_safe(pos, n, head, member) \ | 60 | #define list_for_each_entry_safe(pos, n, head, member) \ |
61 | for (pos = list_entry((head)->next, typeof(*pos), member), \ | 61 | for (pos = list_entry((head)->next, typeof(*pos), member), \ |
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 001facfa5b74..3d1984e59a30 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c | |||
@@ -404,7 +404,7 @@ do_file(char const *const fname) | |||
404 | } | 404 | } |
405 | if (w2(ghdr->e_machine) == EM_S390) { | 405 | if (w2(ghdr->e_machine) == EM_S390) { |
406 | reltype = R_390_64; | 406 | reltype = R_390_64; |
407 | mcount_adjust_64 = -8; | 407 | mcount_adjust_64 = -14; |
408 | } | 408 | } |
409 | if (w2(ghdr->e_machine) == EM_MIPS) { | 409 | if (w2(ghdr->e_machine) == EM_MIPS) { |
410 | reltype = R_MIPS_64; | 410 | reltype = R_MIPS_64; |
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index d4b665610d67..56ea99a12ab7 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl | |||
@@ -243,7 +243,7 @@ if ($arch eq "x86_64") { | |||
243 | 243 | ||
244 | } elsif ($arch eq "s390" && $bits == 64) { | 244 | } elsif ($arch eq "s390" && $bits == 64) { |
245 | $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$"; | 245 | $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$"; |
246 | $mcount_adjust = -8; | 246 | $mcount_adjust = -14; |
247 | $alignment = 8; | 247 | $alignment = 8; |
248 | $type = ".quad"; | 248 | $type = ".quad"; |
249 | $ld .= " -m elf64_s390"; | 249 | $ld .= " -m elf64_s390"; |