lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/xen

Browse Source
This commit is contained in:
Ingo Molnar
2008-06-16 11:21:27 +02:00
parent 7e0edc1bc3 066519068a
commit 688d22e23a
956 changed files with 13794 additions and 7752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/xen/mmu.c
View File

@@ -185,7 +185,7 @@ xmaddr_t arbitrary_virt_to_machine(unsigned long address)
{
unsigned int level;
pte_t *pte = lookup_address(address, &level);
unsigned offset = address & PAGE_MASK;
unsigned offset = address & ~PAGE_MASK;
BUG_ON(pte == NULL);