projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm, hotplug: fix error handling in mem_online_node()
[deliverable/linux.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index 6953d3926e01e8ad1370304064ec2a0e94ad1ebb..87d935333f0dda3d477c5cacd1219b78e7b910e7 100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-1112,11
+1112,13
@@
static unsigned long zap_pte_range(struct mmu_gather *tlb,
int force_flush = 0;
int rss[NR_MM_COUNTERS];
spinlock_t *ptl;
int force_flush = 0;
int rss[NR_MM_COUNTERS];
spinlock_t *ptl;
+ pte_t *start_pte;
pte_t *pte;
again:
init_rss_vec(rss);
pte_t *pte;
again:
init_rss_vec(rss);
- pte = pte_offset_map_lock(mm, pmd, addr, &ptl);
+ start_pte = pte_offset_map_lock(mm, pmd, addr, &ptl);
+ pte = start_pte;
arch_enter_lazy_mmu_mode();
do {
pte_t ptent = *pte;
arch_enter_lazy_mmu_mode();
do {
pte_t ptent = *pte;
@@
-1196,7
+1198,7
@@
again:
add_mm_rss_vec(mm, rss);
arch_leave_lazy_mmu_mode();
add_mm_rss_vec(mm, rss);
arch_leave_lazy_mmu_mode();
- pte_unmap_unlock(
pte - 1
, ptl);
+ pte_unmap_unlock(
start_pte
, ptl);
/*
* mmu_gather ran out of room to batch pages, we break out of
/*
* mmu_gather ran out of room to batch pages, we break out of
@@
-1296,7
+1298,7
@@
static unsigned long unmap_page_range(struct mmu_gather *tlb,
/**
* unmap_vmas - unmap a range of memory covered by a list of vma's
/**
* unmap_vmas - unmap a range of memory covered by a list of vma's
- * @tlb
p
: address of the caller's struct mmu_gather
+ * @tlb: address of the caller's struct mmu_gather
* @vma: the starting vma
* @start_addr: virtual address at which to start unmapping
* @end_addr: virtual address at which to end unmapping
* @vma: the starting vma
* @start_addr: virtual address at which to start unmapping
* @end_addr: virtual address at which to end unmapping
This page took
0.025106 seconds
and
5
git commands to generate.