diff options
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 33 |
2 files changed, 27 insertions, 10 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 78dc9977d5..a12667d899 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.35.10 _kernver=2.6.35 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -157,4 +157,4 @@ ea7a7eb2775b71ae5ef24d029a4905bd xfrm-fix-gre-key-endianess.patch 7cae2d1e1947fa57d7aaaf31c649471c 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch a9494f66196bc6308da0f129221d31b8 kernelconfig.x86 -0270cb828e6b23b4aa844c46c8b2d300 kernelconfig.x86_64" +fdf9056709d32e46b1ce8426ee54809b kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index d730addc70..45a426de26 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35.9 -# Tue Dec 21 08:49:30 2010 +# Linux kernel version: 2.6.35.10 +# Thu Jan 13 09:16:04 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -244,7 +244,10 @@ CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -# CONFIG_XEN is not set +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=32 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y @@ -356,6 +359,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y +# CONFIG_EFI is not set # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set @@ -1141,7 +1145,7 @@ CONFIG_STANDALONE=y CONFIG_FW_LOADER=m # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" -# CONFIG_SYS_HYPERVISOR is not set +CONFIG_SYS_HYPERVISOR=y CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set @@ -1335,6 +1339,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y @@ -2095,6 +2100,7 @@ CONFIG_IEEE802154_FAKEHARD=m # CAIF transport drivers # CONFIG_CAIF_TTY=m +CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_FDDI=y CONFIG_DEFXX=m # CONFIG_DEFXX_MMIO is not set @@ -2199,6 +2205,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m CONFIG_INPUT_EVBUG=m +CONFIG_XEN_KBDDEV_FRONTEND=m # # Input Device Drivers @@ -2380,6 +2387,8 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set @@ -3340,6 +3349,7 @@ CONFIG_FB_TMIO=m CONFIG_FB_TMIO_ACCELL=y CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m CONFIG_FB_METRONOME=m CONFIG_FB_MB862XX=m # CONFIG_FB_MB862XX_PCI_GDC is not set @@ -4040,6 +4050,16 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m # CONFIG_UIO_PCI_GENERIC is not set CONFIG_UIO_NETX=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_ET131X is not set @@ -4581,8 +4601,7 @@ CONFIG_GRKERNSEC_FLOODBURST=4 # # PaX # -CONFIG_PAX_PER_CPU_PGD=y -CONFIG_TASK_SIZE_MAX_SHIFT=42 +CONFIG_TASK_SIZE_MAX_SHIFT=47 CONFIG_PAX=y # @@ -4603,7 +4622,6 @@ CONFIG_PAX_PAGEEXEC=y CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y # CONFIG_PAX_ELFRELOCS is not set -CONFIG_PAX_KERNEXEC=y # # Address Space Layout Randomization @@ -4616,7 +4634,6 @@ CONFIG_PAX_RANDMMAP=y # Miscellaneous hardening features # # CONFIG_PAX_MEMORY_SANITIZE is not set -# CONFIG_PAX_MEMORY_UDEREF is not set CONFIG_PAX_REFCOUNT=y # CONFIG_PAX_USERCOPY is not set CONFIG_KEYS=y |