diff options
author | David S. Miller | 2011-09-22 09:23:13 +0200 |
---|---|---|
committer | David S. Miller | 2011-09-22 09:23:13 +0200 |
commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /include/linux/personality.h | |
parent | bna: PCI Probe Conf Lock Fix (diff) | |
parent | Linux 3.1-rc7 (diff) | |
download | kernel-qcow2-linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.tar.gz kernel-qcow2-linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.tar.xz kernel-qcow2-linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.zip |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'include/linux/personality.h')
-rw-r--r-- | include/linux/personality.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/personality.h b/include/linux/personality.h index eec3bae164d4..8fc7dd1a57ff 100644 --- a/include/linux/personality.h +++ b/include/linux/personality.h @@ -22,6 +22,7 @@ extern int __set_personality(unsigned int); * These occupy the top three bytes. */ enum { + UNAME26 = 0x0020000, ADDR_NO_RANDOMIZE = 0x0040000, /* disable randomization of VA space */ FDPIC_FUNCPTRS = 0x0080000, /* userspace function ptrs point to descriptors * (signal handling) |