Date: | 2012-05-22 14:35:58 (11 years 10 months ago) |
---|---|
Author: | Maarten ter Huurne |
Commit: | 262b3bcd3446e13241d20e9150f7fe0e08b73682 |
Message: | Re-enable zram and zcache on MIPS. This is still not portable, but at least we've got the zram swap feature back now in OpenDingux. |
Files: |
drivers/staging/zcache/Kconfig (1 diff) drivers/staging/zram/Kconfig (1 diff) drivers/staging/zsmalloc/Kconfig (1 diff) drivers/staging/zsmalloc/zsmalloc-main.c (1 diff) |
Change Details
drivers/staging/zcache/Kconfig | ||
---|---|---|
2 | 2 | bool "Dynamic compression of swap pages and clean pagecache pages" |
3 | 3 | # X86 dependency is because zsmalloc uses non-portable pte/tlb |
4 | 4 | # functions |
5 | depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86 | |
5 | depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && (X86 || MIPS) | |
6 | 6 | select ZSMALLOC |
7 | 7 | select CRYPTO_LZO |
8 | 8 | default n |
drivers/staging/zram/Kconfig | ||
---|---|---|
2 | 2 | tristate "Compressed RAM block device support" |
3 | 3 | # X86 dependency is because zsmalloc uses non-portable pte/tlb |
4 | 4 | # functions |
5 | depends on BLOCK && SYSFS && X86 | |
5 | depends on BLOCK && SYSFS && (X86 || MIPS) | |
6 | 6 | select ZSMALLOC |
7 | 7 | select LZO_COMPRESS |
8 | 8 | select LZO_DECOMPRESS |
drivers/staging/zsmalloc/Kconfig | ||
---|---|---|
3 | 3 | # X86 dependency is because of the use of __flush_tlb_one and set_pte |
4 | 4 | # in zsmalloc-main.c. |
5 | 5 | # TODO: convert these to portable functions |
6 | depends on X86 | |
6 | depends on X86 || MIPS | |
7 | 7 | default n |
8 | 8 | help |
9 | 9 | zsmalloc is a slab-based memory allocator designed to store |
drivers/staging/zsmalloc/zsmalloc-main.c | ||
---|---|---|
731 | 731 | } else { |
732 | 732 | set_pte(area->vm_ptes[0], __pte(0)); |
733 | 733 | set_pte(area->vm_ptes[1], __pte(0)); |
734 | #if defined(CONFIG_X86) | |
734 | 735 | __flush_tlb_one((unsigned long)area->vm_addr); |
735 | 736 | __flush_tlb_one((unsigned long)area->vm_addr + PAGE_SIZE); |
737 | #elif defined(CONFIG_MIPS) | |
738 | flush_tlb_one((unsigned long)area->vm_addr); | |
739 | flush_tlb_one((unsigned long)area->vm_addr + PAGE_SIZE); | |
740 | #else | |
741 | #error Unsupported arch. | |
742 | #endif | |
736 | 743 | } |
737 | 744 | put_cpu_var(zs_map_area); |
738 | 745 | } |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9