diff options
| author | JP Abgrall <jpa@google.com> | 2012-05-04 15:03:06 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2012-05-04 15:03:06 -0700 |
| commit | 84b5110abf84dfe8cbcb1434488f259137ac232e (patch) | |
| tree | 77ceac266f22138afee355b00f0b8d075b23d73a /mm | |
| parent | 601b4b2b4a396b69e4524d1c3065d0d80efd0cb5 (diff) | |
| parent | 758aaf52f607604164e93feff93b725d491e44f7 (diff) | |
| download | kernel_samsung_aries-84b5110abf84dfe8cbcb1434488f259137ac232e.zip kernel_samsung_aries-84b5110abf84dfe8cbcb1434488f259137ac232e.tar.gz kernel_samsung_aries-84b5110abf84dfe8cbcb1434488f259137ac232e.tar.bz2 | |
Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown
* common/android-3.0: (135 commits)
net: wireless: bcmdhd: Avoid turning radio UP twice on start
cpufreq: interactive: add boost pulse interface
net: wireless: bcmdhd: Set MMC_PM_KEEP_POWER flag on suspend
net: wireless: bcmdhd: Update to Version 5.90.195.61
net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails
ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend
arm: vfp: Fix memory corruption on PM suspend
Linux 3.0.30
tcp: fix TCP_MAXSEG for established IPv6 passive sockets
net ax25: Reorder ax25_exit to remove races.
ksz884x: don't copy too much in netdev_set_mac_address()
netns: do not leak net_generic data on failed init
tcp: fix tcp_grow_window() for large incoming frames
dummy: Add ndo_uninit().
net: usb: smsc75xx: fix mtu
net_sched: gred: Fix oops in gred_dump() in WRED mode
net/ethernet: ks8851_mll fix rx frame buffer overflow
net: smsc911x: fix skb handling in receive path
8139cp: set intr mask after its handler is registered
atl1: fix kernel panic in case of DMA errors
...
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 2 | ||||
| -rw-r--r-- | mm/swap_state.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f9c5849..f7001ac 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2679,6 +2679,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * so no worry about deadlock. */ page = pte_page(entry); + get_page(page); if (page != pagecache_page) lock_page(page); @@ -2710,6 +2711,7 @@ out_page_table_lock: } if (page != pagecache_page) unlock_page(page); + put_page(page); out_mutex: mutex_unlock(&hugetlb_instantiation_mutex); diff --git a/mm/swap_state.c b/mm/swap_state.c index 4668046..10e9198 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -28,7 +28,7 @@ */ static const struct address_space_operations swap_aops = { .writepage = swap_writepage, - .set_page_dirty = __set_page_dirty_nobuffers, + .set_page_dirty = __set_page_dirty_no_writeback, .migratepage = migrate_page, }; |