Re: ARC backport for stable 3.12

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Jiri,

On Friday 20 June 2014 09:05 PM, Jiri Slaby wrote:
> On 06/20/2014 10:05 AM, Jiri Slaby wrote:
>> On 06/20/2014 09:42 AM, Vineet Gupta wrote:
>>> Hi Greg,
>>>
>>> Can you please backport following mainline commit to 3.12 stable.
>>>
>>> ca6ec3bbaaaf5941e970314a2eb3680b9e7e698a "arc: handle pgtable_page_ctor() fail"
>>
>> Hi, I did.
> 
> But it breaks build, so I dropped that:
>> arc:defconfig fails to build with:

/me slaps myself.

As for the proper fix, per rules of trade, we can only backport existing mainline
patches, but here we need only a partial hunk of that patch. So I'm not sure how I
ask for backport. Maybe below works.

This time patch built/run tested.

---------------->
>From 5dec8f72964beac17c91ff5a6e8186e438c57bbf Mon Sep 17 00:00:00 2001
From: Vineet Gupta <vgupta@xxxxxxxxxxxx>
Date: Sat, 21 Jun 2014 13:31:12 +0530
Subject: [PATCH] arc: fix pgtable_page_ctor() for 3.12 backport

Partial mainline commit ca6ec3bbaaaf5941e970314a2eb3680b9e7e698a

This is needed for enabling latest 3.12 RT kernel to build for ARC.

Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
---
 arch/arc/include/asm/pgalloc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arc/include/asm/pgalloc.h b/arch/arc/include/asm/pgalloc.h
index 36a9f20c21a3..a170c8ceaec8 100644
--- a/arch/arc/include/asm/pgalloc.h
+++ b/arch/arc/include/asm/pgalloc.h
@@ -105,11 +105,13 @@ static inline pgtable_t
 pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
     pgtable_t pte_pg;
+    struct page *page;

     pte_pg = __get_free_pages(GFP_KERNEL | __GFP_REPEAT, __get_order_pte());
     if (pte_pg) {
         memzero((void *)pte_pg, PTRS_PER_PTE * 4);
-        pgtable_page_ctor(virt_to_page(pte_pg));
+        page = virt_to_page(pte_pg);
+        pgtable_page_ctor(page);
     }

     return pte_pg;
-- 



--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]