diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2018-07-29 12:35:45 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2018-07-29 12:35:45 +0200 |
commit | b1d2b0a43d288836bce5e708b88981e2df0bf594 (patch) | |
tree | 1129478b713c33186fc10c50f84f9eed8f931ea2 /arch/arc/include/asm/pgtable.h | |
parent | 3b770017b03a4cdfde0b61a49b4801dc8cca9f69 (diff) | |
parent | a2b3bf4846e5eed62ea6abb096af2c950961033c (diff) | |
download | linux-stable-b1d2b0a43d288836bce5e708b88981e2df0bf594.tar.gz linux-stable-b1d2b0a43d288836bce5e708b88981e2df0bf594.tar.bz2 linux-stable-b1d2b0a43d288836bce5e708b88981e2df0bf594.zip |
Merge tag 'at24-4.19-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.19
at24: updates for v4.19
New property: 'address-width' which allows to specify the number of
addressing bits. Up until now we only could choose one of the defined
models and rely on the flags specified in its corresponding chip data
structure.
Diffstat (limited to 'arch/arc/include/asm/pgtable.h')
-rw-r--r-- | arch/arc/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h index 8ec5599a0957..cf4be70d5892 100644 --- a/arch/arc/include/asm/pgtable.h +++ b/arch/arc/include/asm/pgtable.h @@ -377,7 +377,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, /* Decode a PTE containing swap "identifier "into constituents */ #define __swp_type(pte_lookalike) (((pte_lookalike).val) & 0x1f) -#define __swp_offset(pte_lookalike) ((pte_lookalike).val << 13) +#define __swp_offset(pte_lookalike) ((pte_lookalike).val >> 13) /* NOPs, to keep generic kernel happy */ #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) |