diff options
| author | David Huang <d-huang@ti.com> | 2018-09-11 05:03:59 -0500 |
|---|---|---|
| committer | David Huang <d-huang@ti.com> | 2018-09-11 05:03:59 -0500 |
| commit | fbe2b60c839cd8e3a1f1d72c76369ccb49b4a75e (patch) | |
| tree | 24609239a6d28c6a413725f311bb6e5c0408898f /mm/hugetlb.c | |
| parent | abfa995a49ad0de177ae349ab37c72a9abd1a310 (diff) | |
| parent | 1e8dbd6794e3c2c32c68d77fcf994c3d0aa1260a (diff) | |
| download | omap-omapzoom-fbe2b60c839cd8e3a1f1d72c76369ccb49b4a75e.tar.gz | |
Merge branch 'ti-linux-4.9.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-auto-linux-4.9.y
Auto Merge of:
TI-Feature: lcpd-linux-4.9.y_linux-4.9.y
TI-Tree: git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y
* 'ti-linux-4.9.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel: (1166 commits)
Linux 4.9.126
fs/quota: Fix spectre gadget in do_quotactl
crypto: caam/jr - fix descriptor DMA unmapping
crypto: vmx - Fix sleep-in-atomic bugs
perf auxtrace: Fix queue resize
bcache: release dc->writeback_lock properly in bch_writeback_thread()
printk/tracing: Do not trace printk_nmi_enter()
libnvdimm: fix ars_status output length calculation
getxattr: use correct xattr length
udlfb: set optimal write delay
fb: fix lost console when the user unplugs a USB adapter
pwm: tiehrpwm: Fix disabling of output of PWMs
ubifs: Fix synced_i_size calculation for xattr inodes
ubifs: Check data node size before truncate
Revert "UBIFS: Fix potential integer overflow in allocation"
ubifs: Fix memory leak in lprobs self-check
userns: move user access out of the mutex
sys: don't hold uts_sem while accessing userspace memory
osf_getdomainname(): use copy_to_user()
iommu/vt-d: Fix dev iotlb pfsid use
...
Signed-off-by: David Huang <d-huang@ti.com>
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6ff65c405243..f9e735537c37 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2171,6 +2171,7 @@ static void __init gather_bootmem_prealloc(void) */ if (hstate_is_gigantic(h)) adjust_managed_page_count(page, 1 << h->order); + cond_resched(); } } |