Skip to content

Commit d0631c6

Browse files
torvaldstorvalds
committed
Merge branch 'akpm' (fixes from Andrew)
Merge emailed fixes from Andrew Morton: "Bunch of fixes: - delayed IPC updates. I held back on this because of some possible outstanding bug reports, but they appear to have been addressed in later versions - A bunch of MAINTAINERS updates - Yet Another RTC driver. I'd held this back while a couple of little issues were being worked out. I'm expecting an intrusive-but-simple patchset from Joe Perches which splits up printk.c into kernel/printk/*. That will be a pig to maintain for two months so if it passes testing I'd like to get it upstream after a week or so." * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits) printk: fix incorrect length from print_time() when seconds > 99999 drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield rtc: add RTC driver for TPS6586x MAINTAINERS: fix drivers/staging/sm7xx/ MAINTAINERS: remove include/linux/of_pwm.h MAINTAINERS: remove arch/*/lib/perf_event*.c MAINTAINERS: remove drivers/mmc/host/imxmmc.* MAINTAINERS: fix Documentation/mei/ MAINTAINERS: remove arch/x86/platform/mrst/pmu.* MAINTAINERS: remove firmware/isci/ MAINTAINERS: fix drivers/ieee802154/ MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h MAINTAINERS: remove drivers/video/epson1355fb.c MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb* MAINTAINERS: adjust for UAPI MAINTAINERS: fix drivers/media/platform/atmel-isi.c MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h MAINTAINERS: fix drivers/rtc/rtc-vt8500.c MAINTAINERS: remove arch/arm/plat-s5p/ ...
2 parents de9ac5c + 35dac27 commit d0631c6

File tree

24 files changed

+1035
-200
lines changed

24 files changed

+1035
-200
lines changed

‎Documentation/sysctl/kernel.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ show up in /proc/sys/kernel:
3838
- l2cr [ PPC only ]
3939
- modprobe ==> Documentation/debugging-modules.txt
4040
- modules_disabled
41+
- msg_next_id [ sysv ipc ]
4142
- msgmax
4243
- msgmnb
4344
- msgmni
@@ -62,7 +63,9 @@ show up in /proc/sys/kernel:
6263
- rtsig-max
6364
- rtsig-nr
6465
- sem
66+
- sem_next_id [ sysv ipc ]
6567
- sg-big-buff [ generic SCSI device (sg) ]
68+
- shm_next_id [ sysv ipc ]
6669
- shm_rmid_forced
6770
- shmall
6871
- shmmax [ sysv ipc ]
@@ -320,6 +323,22 @@ to false.
320323

321324
==============================================================
322325

326+
msg_next_id, sem_next_id, and shm_next_id:
327+
328+
These three toggles allows to specify desired id for next allocated IPC
329+
object: message, semaphore or shared memory respectively.
330+
331+
By default they are equal to -1, which means generic allocation logic.
332+
Possible values to set are in range {0..INT_MAX}.
333+
334+
Notes:
335+
1) kernel doesn't guarantee, that new object will have desired id. So,
336+
it's up to userspace, how to handle an object with "wrong" id.
337+
2) Toggle with non-default value will be set back to -1 by kernel after
338+
successful IPC object allocation.
339+
340+
==============================================================
341+
323342
nmi_watchdog:
324343

325344
Enables/Disables the NMI watchdog on x86 systems. When the value is
@@ -542,6 +561,19 @@ are doing anyway :)
542561

543562
==============================================================
544563

564+
shmall:
565+
566+
This parameter sets the total amount of shared memory pages that
567+
can be used system wide. Hence, SHMALL should always be at least
568+
ceil(shmmax/PAGE_SIZE).
569+
570+
If you are not sure what the default PAGE_SIZE is on your Linux
571+
system, you can run the following command:
572+
573+
# getconf PAGE_SIZE
574+
575+
==============================================================
576+
545577
shmmax:
546578

547579
This value can be used to query and set the run time limit

0 commit comments

Comments
 (0)