* [PATCH] arm64: mm: fix __page_to_voff definition
@ 2016-10-21 8:58 Neeraj Upadhyay
2016-10-21 9:45 ` Mark Rutland
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Neeraj Upadhyay @ 2016-10-21 8:58 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Ard Biesheuvel, Mark Rutland,
James Morse, Laura Abbott, linux-arm-kernel, linux-kernel
Cc: Neeraj Upadhyay
Fix parameter name for __page_to_voff, to match its definition.
At present, we don't see any issue, as page_to_virt's caller
declares 'page'.
Fixes: 9f2875912dac ("arm64: mm: restrict virt_to_page() to the linear mapping")
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
---
arch/arm64/include/asm/memory.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index ba62df8..b71086d 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -217,7 +217,7 @@ static inline void *phys_to_virt(phys_addr_t x)
#define _virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
#else
#define __virt_to_pgoff(kaddr) (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))
-#define __page_to_voff(kaddr) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
+#define __page_to_voff(page) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
#define page_to_virt(page) ((void *)((__page_to_voff(page)) | PAGE_OFFSET))
#define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member of the Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] arm64: mm: fix __page_to_voff definition
2016-10-21 8:58 [PATCH] arm64: mm: fix __page_to_voff definition Neeraj Upadhyay
@ 2016-10-21 9:45 ` Mark Rutland
2016-10-21 10:18 ` Ard Biesheuvel
2016-10-30 14:38 ` Catalin Marinas
2 siblings, 0 replies; 5+ messages in thread
From: Mark Rutland @ 2016-10-21 9:45 UTC (permalink / raw)
To: Neeraj Upadhyay
Cc: Catalin Marinas, Will Deacon, Ard Biesheuvel, James Morse,
Laura Abbott, linux-arm-kernel, linux-kernel
On Fri, Oct 21, 2016 at 02:28:46PM +0530, Neeraj Upadhyay wrote:
> Fix parameter name for __page_to_voff, to match its definition.
> At present, we don't see any issue, as page_to_virt's caller
> declares 'page'.
>
> Fixes: 9f2875912dac ("arm64: mm: restrict virt_to_page() to the linear mapping")
> Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Thanks,
Mark.
> ---
> arch/arm64/include/asm/memory.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
> index ba62df8..b71086d 100644
> --- a/arch/arm64/include/asm/memory.h
> +++ b/arch/arm64/include/asm/memory.h
> @@ -217,7 +217,7 @@ static inline void *phys_to_virt(phys_addr_t x)
> #define _virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
> #else
> #define __virt_to_pgoff(kaddr) (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))
> -#define __page_to_voff(kaddr) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
> +#define __page_to_voff(page) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
>
> #define page_to_virt(page) ((void *)((__page_to_voff(page)) | PAGE_OFFSET))
> #define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
> member of the Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] arm64: mm: fix __page_to_voff definition
2016-10-21 8:58 [PATCH] arm64: mm: fix __page_to_voff definition Neeraj Upadhyay
2016-10-21 9:45 ` Mark Rutland
@ 2016-10-21 10:18 ` Ard Biesheuvel
2016-10-30 14:38 ` Catalin Marinas
2 siblings, 0 replies; 5+ messages in thread
From: Ard Biesheuvel @ 2016-10-21 10:18 UTC (permalink / raw)
To: Neeraj Upadhyay
Cc: Catalin Marinas, Will Deacon, Mark Rutland, James Morse,
Laura Abbott, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
On 21 October 2016 at 09:58, Neeraj Upadhyay <neeraju@codeaurora.org> wrote:
> Fix parameter name for __page_to_voff, to match its definition.
> At present, we don't see any issue, as page_to_virt's caller
> declares 'page'.
>
> Fixes: 9f2875912dac ("arm64: mm: restrict virt_to_page() to the linear mapping")
> Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
> ---
> arch/arm64/include/asm/memory.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
> index ba62df8..b71086d 100644
> --- a/arch/arm64/include/asm/memory.h
> +++ b/arch/arm64/include/asm/memory.h
> @@ -217,7 +217,7 @@ static inline void *phys_to_virt(phys_addr_t x)
> #define _virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
> #else
> #define __virt_to_pgoff(kaddr) (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))
> -#define __page_to_voff(kaddr) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
> +#define __page_to_voff(page) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
>
> #define page_to_virt(page) ((void *)((__page_to_voff(page)) | PAGE_OFFSET))
> #define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] arm64: mm: fix __page_to_voff definition
2016-10-21 8:58 [PATCH] arm64: mm: fix __page_to_voff definition Neeraj Upadhyay
2016-10-21 9:45 ` Mark Rutland
2016-10-21 10:18 ` Ard Biesheuvel
@ 2016-10-30 14:38 ` Catalin Marinas
2016-10-31 15:32 ` Catalin Marinas
2 siblings, 1 reply; 5+ messages in thread
From: Catalin Marinas @ 2016-10-30 14:38 UTC (permalink / raw)
To: Neeraj Upadhyay
Cc: Will Deacon, Ard Biesheuvel, Mark Rutland, James Morse,
Laura Abbott, linux-arm-kernel, linux-kernel
On Fri, Oct 21, 2016 at 02:28:46PM +0530, Neeraj Upadhyay wrote:
> Fix parameter name for __page_to_voff, to match its definition.
> At present, we don't see any issue, as page_to_virt's caller
> declares 'page'.
>
> Fixes: 9f2875912dac ("arm64: mm: restrict virt_to_page() to the linear mapping")
> Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
I'll queue this patch for 4.10. Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] arm64: mm: fix __page_to_voff definition
2016-10-30 14:38 ` Catalin Marinas
@ 2016-10-31 15:32 ` Catalin Marinas
0 siblings, 0 replies; 5+ messages in thread
From: Catalin Marinas @ 2016-10-31 15:32 UTC (permalink / raw)
To: Neeraj Upadhyay
Cc: Mark Rutland, Ard Biesheuvel, Will Deacon, linux-kernel,
James Morse, Laura Abbott, linux-arm-kernel
On Sun, Oct 30, 2016 at 02:38:58PM +0000, Catalin Marinas wrote:
> On Fri, Oct 21, 2016 at 02:28:46PM +0530, Neeraj Upadhyay wrote:
> > Fix parameter name for __page_to_voff, to match its definition.
> > At present, we don't see any issue, as page_to_virt's caller
> > declares 'page'.
> >
> > Fixes: 9f2875912dac ("arm64: mm: restrict virt_to_page() to the linear mapping")
> > Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
>
> I'll queue this patch for 4.10. Thanks.
I didn't realise that Will sent it already for 4.9-rc3, so I dropped it
from the 4.10 queue.
--
Catalin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-31 15:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-21 8:58 [PATCH] arm64: mm: fix __page_to_voff definition Neeraj Upadhyay
2016-10-21 9:45 ` Mark Rutland
2016-10-21 10:18 ` Ard Biesheuvel
2016-10-30 14:38 ` Catalin Marinas
2016-10-31 15:32 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox