Re: [PATCH] x86/xen: fix arbitrary_virt_to_machine()

[Ingo Molnar <mingo@elte.hu>]

* Jeremy Fitzhardinge <jeremy@goop.org> wrote:

> Jan Beulich wrote:
>> While I realize that the function isn't currently being used, I still
>> think an obvious mistake like this should be corrected.
>>
>> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>>
>> --- a/arch/x86/xen/mmu.c
>> +++ b/arch/x86/xen/mmu.c
>> @@ -60,7 +60,7 @@ xmaddr_t arbitrary_virt_to_machine(unsig
>>  {
>>  	unsigned int level;
>>  	pte_t *pte = lookup_address(address, &level);
>> -	unsigned offset = address & PAGE_MASK;
>> +	unsigned offset = address & (PAGE_SIZE - 1);
>>   
>
> Yeah.  But I'd prefer "~PAGE_MASK".

ok - queued up the patch below in -tip.

	Ingo

----------------------->
Subject: x86/xen: fix arbitrary_virt_to_machine()
From: "Jan Beulich" <jbeulich@novell.com>
Date: Thu, 15 May 2008 13:24:52 +0100

While I realize that the function isn't currently being used, I still
think an obvious mistake like this should be corrected.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/xen/mmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux/arch/x86/xen/mmu.c
===================================================================
--- linux.orig/arch/x86/xen/mmu.c
+++ linux/arch/x86/xen/mmu.c
@@ -60,7 +60,7 @@ xmaddr_t arbitrary_virt_to_machine(unsig
 {
 	unsigned int level;
 	pte_t *pte = lookup_address(address, &level);
-	unsigned offset = address & PAGE_MASK;
+	unsigned offset = address & ~PAGE_SIZE;
 
 	BUG_ON(pte == NULL);