Re: [PATCH 24/38] mips: drop _PAGE_FILE and pte_file()-related helpers

Geert Uytterhoeven
2014-12-25T10:08:23Z

On Wed, Dec 24, 2014 at 1:22 PM, Kirill A. Shutemov
<kirill.shutemov@linux.intel.com> wrote:
> We've replaced remap_file_pages(2) implementation with emulation.
> Nobody creates non-linear mapping anymore.
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> ---
> arch/m68k/include/asm/mcf_pgtable.h | 6 ++----

This contains a change to an m68k header file.
The same file was modified in the m68k part of the series, but this change was
not included?

> --- a/arch/m68k/include/asm/mcf_pgtable.h
> +++ b/arch/m68k/include/asm/mcf_pgtable.h
> @@ -385,15 +385,13 @@ static inline void cache_page(void *vaddr)
> *ptep = pte_mkcache(*ptep);
> }
>
> -#define PTE_FILE_SHIFT 11
> -
> /*
> * Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e))
> */
> #define __swp_type(x) ((x).val & 0xFF)
> -#define __swp_offset(x) ((x).val >> PTE_FILE_SHIFT)
> +#define __swp_offset(x) ((x).val >> 11)
> #define __swp_entry(typ, off) ((swp_entry_t) { (typ) | \
> - (off << PTE_FILE_SHIFT) })
> + (off << 11) })
> #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
> #define __swp_entry_to_pte(x) (__pte((x).val))

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds