diff options
| author | Linus Torvalds | 2014-02-26 00:38:13 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-02-26 00:38:13 +0100 |
| commit | d2a0476307e67a6e6a293563a4f4ad4ec79ac0e5 (patch) | |
| tree | 45abc67e451fae6c0c4403014bb1cda4d2a1fe3a /include/linux | |
| parent | Merge tag 'dmaengine-fixes-3.14-rc4' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | MAINTAINERS: change mailing list address for Altera UART drivers (diff) | |
| download | kernel-qcow2-linux-d2a0476307e67a6e6a293563a4f4ad4ec79ac0e5.tar.gz kernel-qcow2-linux-d2a0476307e67a6e6a293563a4f4ad4ec79ac0e5.tar.xz kernel-qcow2-linux-d2a0476307e67a6e6a293563a4f4ad4ec79ac0e5.zip | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton.
* emailed patches from Andrew Morton akpm@linux-foundation.org>:
MAINTAINERS: change mailing list address for Altera UART drivers
Makefile: fix build with make 3.80 again
MAINTAINERS: update L: misuses
Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled
ipc,mqueue: remove limits for the amount of system-wide queues
memcg: change oom_info_lock to mutex
mm, thp: fix infinite loop on memcg OOM
drivers/fmc/fmc-write-eeprom.c: fix decimal permissions
drivers/iommu/omap-iommu-debug.c: fix decimal permissions
mm, hwpoison: release page on PageHWPoison() in __do_fault()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipc_namespace.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index e7831d203737..35e7eca4e33b 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h @@ -118,9 +118,7 @@ extern int mq_init_ns(struct ipc_namespace *ns); * the new maximum will handle anyone else. I may have to revisit this * in the future. */ -#define MIN_QUEUESMAX 1 #define DFLT_QUEUESMAX 256 -#define HARD_QUEUESMAX 1024 #define MIN_MSGMAX 1 #define DFLT_MSG 10U #define DFLT_MSGMAX 10 |