diff options
| author | Alexey Brodkin <abrodkin@synopsys.com> | 2018-06-28 16:59:14 -0700 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2018-07-09 11:31:49 -0700 |
| commit | 6e3761145a9ba3ce267c330b6bff51cf6a057b06 (patch) | |
| tree | 8c65602aafac08518ca3cc0e8153cfb8db74cbd6 /arch | |
| parent | ca1147fc2487335e9d1d7a931996eae176863a4c (diff) | |
| download | linux-stable-6e3761145a9ba3ce267c330b6bff51cf6a057b06.tar.gz linux-stable-6e3761145a9ba3ce267c330b6bff51cf6a057b06.tar.bz2 linux-stable-6e3761145a9ba3ce267c330b6bff51cf6a057b06.zip | |
ARC: Fix CONFIG_SWAP
swap was broken on ARC due to silly copy-paste issue.
We encode offset from swapcache page in __swp_entry() as (off << 13) but
were not decoding back in __swp_offset() as (off >> 13) - it was still
(off << 13).
This finally fixes swap usage on ARC.
| # mkswap /dev/sda2
|
| # swapon -a -e /dev/sda2
| Adding 500728k swap on /dev/sda2. Priority:-2 extents:1 across:500728k
|
| # free
| total used free shared buffers cached
| Mem: 765104 13456 751648 4736 8 4736
| -/+ buffers/cache: 8712 756392
| Swap: 500728 0 500728
Cc: stable@vger.kernel.org
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch')
| -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 08fe33830d4b..77676e18da69 100644 --- a/arch/arc/include/asm/pgtable.h +++ b/arch/arc/include/asm/pgtable.h @@ -379,7 +379,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) }) |