git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
page_types.h
diff --git
a/arch/x86/include/asm/page_types.h
b/arch/x86/include/asm/page_types.h
index
a667f24
..
1df6621
100644
(file)
--- a/
arch/x86/include/asm/page_types.h
+++ b/
arch/x86/include/asm/page_types.h
@@
-8,7
+8,7
@@
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#define __PHYSICAL_MASK ((phys_addr_t)(
1ULL << __PHYSICAL_MASK_SHIFT) - 1
)
+#define __PHYSICAL_MASK ((phys_addr_t)(
(1ULL << __PHYSICAL_MASK_SHIFT) - 1)
)
#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1)
/* Cast PAGE_MASK to a signed type so that it is sign-extended if
#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1)
/* Cast PAGE_MASK to a signed type so that it is sign-extended if