From 9c50ea380a1a84cc1b8cf08ba8793368cb7b4f63 Mon Sep 17 00:00:00 2001 From: Hirokazu Takata Date: Thu, 10 May 2007 22:22:28 -0700 Subject: [PATCH] --- yaml --- r: 55891 b: refs/heads/master c: 23c9bbbac57ae50dceadfda37b49785ec04dd42f h: refs/heads/master i: 55889: 3f07d71805fb486b991bbe36dfafc501159fa3d8 55887: e0d494929a32ebbdbb988c3fd3759d8c7a10c342 v: v3 --- [refs] | 2 +- trunk/include/asm-m32r/pgtable-2level.h | 4 ++-- trunk/include/asm-m32r/pgtable.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 81182a7fe9bd..eccb120b66e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d4f64681695b0e389f7121eb647b27c602990bc +refs/heads/master: 23c9bbbac57ae50dceadfda37b49785ec04dd42f diff --git a/trunk/include/asm-m32r/pgtable-2level.h b/trunk/include/asm-m32r/pgtable-2level.h index 750925726a10..bca3475f9595 100644 --- a/trunk/include/asm-m32r/pgtable-2level.h +++ b/trunk/include/asm-m32r/pgtable-2level.h @@ -71,8 +71,8 @@ static inline pmd_t *pmd_offset(pgd_t * dir, unsigned long address) #define pfn_pmd(pfn, prot) __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) #define PTE_FILE_MAX_BITS 29 -#define pte_to_pgoff(pte) (((pte_val(pte) >> 2) & 0xef) | (((pte_val(pte) >> 10)) << 7)) -#define pgoff_to_pte(off) ((pte_t) { (((off) & 0xef) << 2) | (((off) >> 7) << 10) | _PAGE_FILE }) +#define pte_to_pgoff(pte) (((pte_val(pte) >> 2) & 0x7f) | (((pte_val(pte) >> 10)) << 7)) +#define pgoff_to_pte(off) ((pte_t) { (((off) & 0x7f) << 2) | (((off) >> 7) << 10) | _PAGE_FILE }) #endif /* __KERNEL__ */ #endif /* _ASM_M32R_PGTABLE_2LEVEL_H */ diff --git a/trunk/include/asm-m32r/pgtable.h b/trunk/include/asm-m32r/pgtable.h index 8b2a2f17e695..6604303fc47c 100644 --- a/trunk/include/asm-m32r/pgtable.h +++ b/trunk/include/asm-m32r/pgtable.h @@ -366,7 +366,7 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep) #define pte_unmap_nested(pte) do { } while (0) /* Encode and de-code a swap entry */ -#define __swp_type(x) (((x).val >> 2) & 0x3f) +#define __swp_type(x) (((x).val >> 2) & 0x1f) #define __swp_offset(x) ((x).val >> 10) #define __swp_entry(type, offset) \ ((swp_entry_t) { ((type) << 2) | ((offset) << 10) })