summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-01-17 14:24:13 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2021-01-17 14:24:13 +0100
commitcf3e310ff85b280eec62a1470465d986be80c204 (patch)
tree0c54b22039687e9ad214d6da7ca1506bcc30b888 /include/asm-generic
parentd29d26d11fc2c6457fc0d7b45b67d01a81575cea (diff)
parent4328b0f47a72b408ff9038a79817b3698281914f (diff)
Merge 4.4.252 into android-4.4-p
Changes in 4.4.252 target: add XCOPY target/segment desc sense codes target: bounds check XCOPY segment descriptor list target: simplify XCOPY wwn->se_dev lookup helper target: use XCOPY segment descriptor CSCD IDs xcopy: loop over devices using idr helper scsi: target: Fix XCOPY NAA identifier lookup powerpc: Fix incorrect stw{, ux, u, x} instructions in __set_pte_at net: ip: always refragment ip defragmented packets net: fix pmtu check in nopmtudisc mode vmlinux.lds.h: Add PGO and AutoFDO input sections ubifs: wbuf: Don't leak kernel memory to flash spi: pxa2xx: Fix use-after-free on unbind cpufreq: powernow-k8: pass policy rather than use cpufreq_cpu_get() wil6210: select CONFIG_CRC32 block: rsxx: select CONFIG_CRC32 iommu/intel: Fix memleak in intel_irq_remapping_alloc block: fix use-after-free in disk_part_iter_next net: drop bogus skb with CHECKSUM_PARTIAL and offset beyond end of trimmed packet Linux 4.4.252 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I52de3890001cf1dd465a82774f65934443485761
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index a97f28205dfa..3388a64ab294 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -431,7 +431,10 @@
* during second ld run in second ld pass when generating System.map */
#define TEXT_TEXT \
ALIGN_FUNCTION(); \
- *(.text.hot .text .text.fixup .text.unlikely) \
+ *(.text.hot .text.hot.*) \
+ *(.text .text.fixup) \
+ *(.text.unlikely .text.unlikely.*) \
+ *(.text.unknown .text.unknown.*) \
*(.ref.text) \
MEM_KEEP(init.text) \
MEM_KEEP(exit.text) \