diff options
| author | Richard Weinberger <richard@nod.at> | 2012-04-14 17:46:01 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-05-21 21:09:35 +0200 |
| commit | 2b76ebaa728f8a3967c52aa189261c72fe56a6f1 (patch) | |
| tree | ed106b9b9f1f0650792b602f9f47571406ee6ebd /arch/um | |
| parent | f15b9000eb1d09bbaa4b0a6b2089d7e1f64e84b3 (diff) | |
| download | linux-2b76ebaa728f8a3967c52aa189261c72fe56a6f1.tar.gz linux-2b76ebaa728f8a3967c52aa189261c72fe56a6f1.tar.bz2 linux-2b76ebaa728f8a3967c52aa189261c72fe56a6f1.zip | |
um: Fix __swp_type()
The current __swp_type() function uses a too small bitshift.
Using more than one swap files causes bad pages because
the type bits clash with other page flags.
CC: stable@kernel.org
Analyzed-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/pgtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index 294254e13a35..5888f1b83477 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -354,11 +354,11 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr); #define update_mmu_cache(vma,address,ptep) do ; while (0) /* Encode and de-code a swap entry */ -#define __swp_type(x) (((x).val >> 4) & 0x3f) +#define __swp_type(x) (((x).val >> 5) & 0x1f) #define __swp_offset(x) ((x).val >> 11) #define __swp_entry(type, offset) \ - ((swp_entry_t) { ((type) << 4) | ((offset) << 11) }) + ((swp_entry_t) { ((type) << 5) | ((offset) << 11) }) #define __pte_to_swp_entry(pte) \ ((swp_entry_t) { pte_val(pte_mkuptodate(pte)) }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) |