diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-24 14:50:00 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-24 14:50:00 +0100 |
| commit | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (patch) | |
| tree | bc42529997fa58fc26481c8ba7524560f3baa5af /libre | |
| parent | f87cdf22eb712b5b1c118f768d4ff710fc839403 (diff) | |
| parent | d466ef49f224a9347fe0375eac8126725e10a0a4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
community/flac123/PKGBUILD
community/flashrom/PKGBUILD
community/liblockfile/PKGBUILD
community/python-cjson/PKGBUILD
community/tcpflow/PKGBUILD
extra/vlc/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686 | 4 | ||||
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 465e8b395..3cb6108d5 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -33,8 +33,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li md5sums=('27c641c4f6785fc647cdd3e44963a55c' '37a0fdc7ad19c9489faf09925b4fae5b' '690e6201d219638544d2fba3996dc822' - 'f27599e6b2a002d1a13b2249ff030314' - 'c51cdf3d047db4bbb46bfa70fe92b196' + '79db8a444fd149e409f706830d8cee9a' + 'e26dbcb367a2b48f5ed09560e2ae8fa0' 'a8a3843046926eb7ab81312cd438c5c5' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index be8d43e31..d2d688197 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -422,8 +422,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CLEANCACHE=y # CONFIG_HIGHPTE is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 427eee5e3..80ea3030f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -409,8 +409,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CLEANCACHE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y |