[PATCH] highmem: Fix ARM build break due to __kmap_atomic rename

[PATCH] highmem: Fix ARM build break due to __kmap_atomic rename

[Stephen Warren]

Git commit 37bfbb9 "highmem: kill all __kmap_atomic()" renamed
__kmap_atomic to kmap_atomic. However, arch/arm/include/asm/highmem.h
wasn't updated for that change. This change does so, and fixes the
ARM build break.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
This shows up in next-20111206 at least.

 arch/arm/include/asm/highmem.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/include/asm/highmem.h b/arch/arm/include/asm/highmem.h
index a4edd19..8c5e828 100644
--- a/arch/arm/include/asm/highmem.h
+++ b/arch/arm/include/asm/highmem.h
@@ -57,7 +57,7 @@ static inline void *kmap_high_get(struct page *page)
 #ifdef CONFIG_HIGHMEM
 extern void *kmap(struct page *page);
 extern void kunmap(struct page *page);
-extern void *__kmap_atomic(struct page *page);
+extern void *kmap_atomic(struct page *page);
 extern void __kunmap_atomic(void *kvaddr);
 extern void *kmap_atomic_pfn(unsigned long pfn);
 extern struct page *kmap_atomic_to_page(const void *ptr);
-- 
1.7.0.4

[PATCH] highmem: Fix ARM build break due to __kmap_atomic rename

[Nicolas Pitre]

On Tue, 6 Dec 2011, Stephen Warren wrote:

> Git commit 37bfbb9 "highmem: kill all __kmap_atomic()" renamed
> __kmap_atomic to kmap_atomic. However, arch/arm/include/asm/highmem.h
> wasn't updated for that change. This change does so, and fixes the
> ARM build break.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> This shows up in next-20111206 at least.

Commit 37bfbb9 doesn't show up in anything which is stable yet.  Would 
be best to ask the original author to fix his branch.


Nicolas

[PATCH] highmem: Fix ARM build break due to __kmap_atomic rename

[Stephen Warren]

Nicolas Pitre wrote at Tuesday, December 06, 2011 12:42 PM:
> On Tue, 6 Dec 2011, Stephen Warren wrote:
> > Git commit 37bfbb9 "highmem: kill all __kmap_atomic()" renamed
> > __kmap_atomic to kmap_atomic. However, arch/arm/include/asm/highmem.h
> > wasn't updated for that change. This change does so, and fixes the
> > ARM build break.
> >
> > Signed-off-by: Stephen Warren <swarren@nvidia.com>
> > ---
> > This shows up in next-20111206 at least.
> 
> Commit 37bfbb9 doesn't show up in anything which is stable yet.  Would
> be best to ask the original author to fix his branch.

Yes, I assumed that Cong would squash this into his/her tree that's in
linux-next.

-- 
nvpublic

[PATCH] highmem: Fix ARM build break due to __kmap_atomic rename

[Cong Wang]

? 2011?12?07? 03:52, Stephen Warren ??:
> Nicolas Pitre wrote at Tuesday, December 06, 2011 12:42 PM:
>> On Tue, 6 Dec 2011, Stephen Warren wrote:
>>> Git commit 37bfbb9 "highmem: kill all __kmap_atomic()" renamed
>>> __kmap_atomic to kmap_atomic. However, arch/arm/include/asm/highmem.h
>>> wasn't updated for that change. This change does so, and fixes the
>>> ARM build break.
>>>
>>> Signed-off-by: Stephen Warren<swarren@nvidia.com>
>>> ---
>>> This shows up in next-20111206 at least.
>>
>> Commit 37bfbb9 doesn't show up in anything which is stable yet.  Would
>> be best to ask the original author to fix his branch.
>
> Yes, I assumed that Cong would squash this into his/her tree that's in
> linux-next.
>

Thanks for your patch, Stephen!

I have squashed your patch into that commit,

commit 5bf31c9a5de45a6ea6628fe84c043ac38babf393
Author: Cong Wang <amwang@redhat.com>
Date:   Sat Nov 26 10:53:39 2011 +0800

     highmem: kill all __kmap_atomic()
     [swarren at nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]

     Signed-off-by: Stephen Warren <swarren@nvidia.com>
     Signed-off-by: Cong Wang <amwang@redhat.com>