diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:24:46 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:24:46 -0800 |
| commit | 6679a18a14a4ff9fae7fb0ee554e7161619308ad (patch) | |
| tree | 92d5c10caec1803ee98447eac09892e713956523 /Documentation | |
| parent | c9e5228eb9632625c04800dcbd2a83dc0542fbce (diff) | |
| parent | 24dc742abc1fa4f953b42750ec08e3ec4586de42 (diff) | |
Merge branch 'v3.18/topic/aosp' into linux-linaro-lsk-v3.18-android
* v3.18/topic/aosp: (25 commits)
wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
CHROMIUM: android: fix warning when releasing active sync point
mm: reorder can_do_mlock to fix audit denial
staging: ion: debugfs to shrink pool
usb: gadget: configfs: handle gadget reset request for android
Enable adb with android-pipe in IA image
selinux: Android kernel compatibility with M userspace
selinux: extended permissions for ioctls
security: add ioctl specific auditing to lsm_audit
selinux: remove unnecessary pointer reassignment
Revert "security: lsm_audit: add ioctl specific auditing"
Revert "SELinux: per-command whitelisting of ioctls"
Revert "SELinux: use deletion-safe iterator to free list"
Revert "SELinux: ss: Fix policy write for ioctl operations"
android: add CONFIG_DEBUG_RODATA to recommended config
arm: mm: support ARCH_MMAP_RND_BITS.
mm: mmap: Add new /proc tunable for mmap_base ASLR.
Don't kill IPv4 sockets when killing IPv6 sockets was requested.
uid_cputime: Check for the range while removing range of UIDs.
...
Conflicts:
drivers/usb/gadget/Kconfig
Conflict due to android-3.18 merge trying to sneak in Android
Composite Gadget "USB_G_ANDROID" changes into
drivers/usb/gadget/Kconfig which we have already moved to
drivers/usb/gadget/legacy/Kconfig during last restructuring.
Resolution (as recommended by Amit Pundir)
Delete "USB_G_ANDROID" and dependent config option and keep only
USB_CONFIGFS_F_MIDI specific changes from AOSP commit 2ccf4f4f216f
"usb: gadget: Remove circular dependency on Config".
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index 57baff5bdb80..62044945a118 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -41,6 +41,7 @@ show up in /proc/sys/kernel: - kptr_restrict - kstack_depth_to_print [ X86 only ] - l2cr [ PPC only ] +- mmap_rnd_bits - modprobe ==> Documentation/debugging-modules.txt - modules_disabled - msg_next_id [ sysv ipc ] @@ -386,6 +387,19 @@ This flag controls the L2 cache of G3 processor boards. If ============================================================== +mmap_rnd_bits: + +This value can be used to select the number of bits to use to +determine the random offset to the base address of vma regions +resulting from mmap allocations on architectures which support +tuning address space randomization. This value will be bounded +by the architecture's minimum and maximum supported values. + +This value can be changed after boot using the +/proc/sys/kernel/mmap_rnd_bits tunable + +============================================================== + modules_disabled: A toggle value indicating if modules are allowed to be loaded |