diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-05 13:01:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-05 13:01:00 +0100 |
| commit | 14d5042fdcd703bd08b3cc829aed4f39d448f398 (patch) | |
| tree | 6607dcd0a8d4e7cc04599f64fbbaf518973de3f0 /scripts | |
| parent | 7b1717fd47d6113f0cf28e82f7d0dc80e0b05621 (diff) | |
| parent | 0dc4b955f01eae10c6923c86234ef9768137797f (diff) | |
Merge 4.4.298 into android-4.4-p
Changes in 4.4.298
platform/x86: apple-gmux: use resource_size() with res
recordmcount.pl: fix typo in s390 mcount regex
selinux: initialize proto variable in selinux_ip_postroute_compat()
nfc: uapi: use kernel size_t to fix user-space builds
uapi: fix linux/nfc.h userspace compilation errors
xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.
usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear.
scsi: vmw_pvscsi: Set residual data length conditionally
Input: appletouch - initialize work before device registration
Input: spaceball - fix parsing of movement data packets
net: fix use-after-free in tw_timer_handler
Linux 4.4.298
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If5baf377c3d2fb89e244b005a47ddaccaff9e9f9
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/recordmcount.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index b690b294fc36..e1de4423abce 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -248,7 +248,7 @@ if ($arch eq "x86_64") { } elsif ($arch eq "s390" && $bits == 64) { if ($cc =~ /-DCC_USING_HOTPATCH/) { - $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$"; + $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(brcl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$"; $mcount_adjust = 0; } else { $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$"; |