2 files changed, 1 insertions, 15 deletions

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 4893f3e2c336..1af63307b24f 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -261,7 +261,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t p
         struct page *page;
         unsigned long pfn;
         unsigned long pg_flags;
-        unsigned long mm_rss;
 
         pfn = pte_pfn(pte);
         if (pfn_valid(pfn) &&
@@ -285,10 +284,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t p
         }
 
         mm = vma->vm_mm;
-        mm_rss = get_mm_rss(mm);
-        if (mm_rss >= mm->context.tsb_rss_limit)
-                tsb_grow(mm, mm_rss, GFP_ATOMIC);
-
         if ((pte_val(pte) & _PAGE_ALL_SZ_BITS) == _PAGE_SZBITS) {
                 struct tsb *tsb;
                 unsigned long tag;
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 787533f01049..2cc8e6528c63 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -310,7 +310,6 @@ void tsb_grow(struct mm_struct *mm, unsigned long rss, gfp_t gfp_flags)
 
 int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
-        unsigned long initial_rss;
 
         mm->context.sparc64_ctx_val = 0UL;
 
@@ -319,15 +318,7 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
          * will be confused and think there is an older TSB to free up.
          */
         mm->context.tsb = NULL;
-
-        /* If this is fork, inherit the parent's TSB size.  We would
-         * grow it to that size on the first page fault anyways.
-         */
-        initial_rss = mm->context.tsb_nentries;
-        if (initial_rss)
-                initial_rss -= 1;
-
-        tsb_grow(mm, initial_rss, GFP_KERNEL);
+        tsb_grow(mm, 0, GFP_KERNEL);
 
         if (unlikely(!mm->context.tsb))
                 return -ENOMEM;