David Rientjes
72788c3856
oom: replace PF_OOM_ORIGIN with toggling oom_score_adj ...
There's a kernel-wide shortage of per-process flags, so it's always
helpful to trim one when possible without incurring a significant penalty.
It's even more important when you're planning on adding a per- process
flag yourself, which I plan to do shortly for transparent hugepages.
PF_OOM_ORIGIN is used by ksm and swapoff to prefer current since it has a
tendency to allocate large amounts of memory and should be preferred for
killing over other tasks. We'd rather immediately kill the task making
the errant syscall rather than penalizing an innocent task.
This patch removes PF_OOM_ORIGIN since its behavior is equivalent to
setting the process's oom_score_adj to OOM_SCORE_ADJ_MAX.
The process's old oom_score_adj is stored and then set to
OOM_SCORE_ADJ_MAX during the time it used to have PF_OOM_ORIGIN. The old
value is then reinstated when the process should no longer be considered a
high priority for oom killing.
Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-05-25 08:39:10 -07:00
bcma: add missing GPIO defines, use PULL register only when available
2011-05-11 14:50:41 -04:00
can: make struct can_proto const
2011-05-04 14:08:36 -07:00
[media] DVB: Add basic API support for DVB-T2 and bump minor version
2011-05-20 18:51:09 -03:00
Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux
2011-05-24 16:39:23 -07:00
Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander
2011-05-19 00:59:55 -07:00
Merge branch 'next' into for-linus
2011-05-24 00:06:26 -07:00
Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
2011-05-16 11:32:26 -04:00
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
2011-05-24 11:51:26 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
2011-04-19 11:24:06 -07:00
Input: ads7846 - add possibility to use external vref on ads7846
2011-05-12 08:28:56 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
SUNRPC: Allow RPC calls to return ETIMEDOUT instead of EIO
2011-04-24 14:28:45 -04:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-05-23 12:33:02 -07:00
timers: Improve alarmtimer comments and minor fixes
2011-04-28 13:39:17 -07:00
ath9k_hw: Get AHB clock information from ath9k_platform_data
2011-04-25 14:50:08 -04:00
exec: unify do_execve/compat_do_execve code
2011-04-09 15:53:56 +02:00
bit_spinlock: don't play preemption games inside the busy loop
2011-04-25 18:10:58 -07:00
block: get rid of QUEUE_FLAG_REENTER
2011-04-19 13:32:46 +02:00
mm: use alloc_bootmem_node_nopanic() on really needed path
2011-05-11 18:50:44 -07:00
lib: Add generic binary search function to the kernel.
2011-05-19 16:55:27 +09:30
Merge branch 'next' into for-linus
2011-05-24 22:55:24 +10:00
clockevents: Provide interface to reconfigure an active clock event device
2011-05-19 14:24:16 +02:00
clocksource: add common mmio clocksource
2011-05-23 18:04:51 +01:00
[CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.
2011-05-04 11:50:57 -04:00
Cache user_ns in struct cred
2011-05-13 11:45:33 -07:00
vfs: get rid of insane dentry hashing rules
2011-04-24 07:58:46 -07:00
md/dm - remove remains of plug_fn callback.
2011-04-18 18:25:41 +10:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-05-19 18:24:11 -07:00
dlm: make plock operation killable
2011-05-23 10:47:06 -05:00
ARM: 6882/1: ELF: Define new core note type for VFP registers
2011-05-14 21:36:55 +01:00
ethtool: Added support for FW dump
2011-05-13 14:37:28 -04:00
fbcon: add lifetime refcount to opened frame buffers
2011-05-12 07:37:51 -07:00
net: filter: move forward declarations to avoid compile warnings
2011-05-22 21:01:22 -04:00
firewire: sbp2: parallelize login, reconnect, logout
2011-05-10 22:53:46 +02:00
flex_array: flex_array_prealloc takes a number of elements, not an end
2011-04-28 16:12:47 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
2011-05-15 10:22:10 -07:00
USB: extend ehci-fsl and fsl_udc_core driver for OTG operation
2011-05-02 16:59:38 -07:00
ftrace: Modify ftrace_set_filter/notrace to take ops
2011-05-18 19:22:52 -04:00
Regression: partial revert "tracing: Remove lock_depth from event entry"
2011-05-06 13:20:59 -07:00
mm: add alloc_pages_exact_nid()
2011-05-11 18:50:45 -07:00
Input: gpio-keys - add support for setting device name
2011-04-11 23:53:19 -07:00
hrtimers: Reorder clock bases
2011-05-23 13:59:54 +02:00
mm: thp: fix /dev/zero MAP_PRIVATE and vm_flags cleanups
2011-04-28 11:28:20 -07:00
ide: Use linux/mutex.h
2011-05-08 16:41:45 -07:00
mac80211: Self-protected management frames are not robust
2011-05-11 14:44:48 -04:00
net: add mac_pton() for parsing MAC address
2011-05-09 12:10:49 -07:00
vlan: remove one synchronize_net() call
2011-05-09 11:41:41 -07:00
ftrace: Avoid recording mcount on .init sections directly
2011-05-16 14:46:30 -04:00
Merge branch 'next' into for-linus
2011-05-24 22:55:24 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-04-18 13:29:03 -07:00
rcu: move TREE_RCU from softirq to kthread
2011-05-05 23:16:54 -07:00
genirq: Add chip suspend and resume callbacks
2011-04-23 15:56:24 +02:00
genirq: Uninline and sanity check generic_handle_irq()
2011-05-18 14:59:08 +02:00
[media] uvcvideo: Make the API public
2011-05-20 09:30:46 -03:00
ftrace: Allow dynamically allocated function tracers
2011-05-18 15:29:51 -04:00
Merge branch 'next' into for-linus
2011-05-24 22:55:24 +10:00
KVM: PPC: booke: add sregs support
2011-05-22 08:47:53 -04:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-05-23 15:39:34 -07:00
include/linux/leds-regulator.h: fix syntax in example code
2011-04-13 11:11:43 +02:00
libata: Power off empty ports
2011-05-19 20:50:53 -04:00
x86: Get rid of asmregparm
2011-05-24 14:33:35 +02:00
list: remove prefetching from regular list iterators
2011-05-19 14:15:29 -07:00
add hlist_bl_lock/unlock helpers
2011-04-25 18:14:10 -07:00
LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH
2011-04-25 18:14:07 -04:00
memcg: fix mem_cgroup_rotate_reclaimable_page()
2011-04-14 16:06:54 -07:00
mm, mem-hotplug: recalculate lowmem_reserve when memory hotplug occurs
2011-05-25 08:39:09 -07:00
bcma: add Broadcom specific AMBA bus driver
2011-05-10 15:54:54 -04:00
module: Sort exported symbols
2011-05-19 16:55:27 +09:30
module: reorder kparam_array to remove alignment padding on 64 bit builds
2011-05-19 16:55:25 +09:30
ipv4: Pass explicit saddr/daddr args to ipmr_get_route().
2011-05-04 12:18:54 -07:00
mutex: Use p->on_cpu for the adaptive spin
2011-04-14 08:52:33 +02:00
mxm/wmi: add MXMX interface entry point.
2011-05-09 11:40:38 +10:00
net: Add sendmmsg socket system call
2011-05-05 11:10:14 -07:00
macvlan: remove one synchronize_rcu() call
2011-05-20 00:33:18 -04:00
NFSv4.1: Don't loop forever in nfs4_proc_create_session
2011-04-24 14:28:18 -04:00
NFSv4.1: Ensure that layoutget uses the correct gfp modes
2011-05-11 22:52:13 -04:00
nilfs2: add ioctl which limits range of segment to be allocated
2011-05-10 22:21:45 +09:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-05-16 19:32:19 -04:00
watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
2011-05-23 11:58:59 +02:00
net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
2011-05-22 21:01:19 -04:00
drivercore: revert addition of of_match to struct device
2011-05-18 12:32:23 -06:00
of: Export of_irq_find_parent()
2011-04-20 17:01:19 +10:00
oom: replace PF_OOM_ORIGIN with toggling oom_score_adj
2011-05-25 08:39:10 -07:00
[S390] merge page_test_dirty and page_clear_dirty
2011-05-23 10:24:31 +02:00
mm: introduce wait_on_page_locked_killable()
2011-05-25 08:39:08 -07:00
PCI/e1000e: Add and use pci_disable_link_state_locked()
2011-05-21 12:16:44 -07:00
PCI: Move ATS declarations in seperate header file
2011-04-11 09:01:41 +02:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-05-24 12:06:40 -07:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-05-23 15:39:34 -07:00
PCI: add latency tolerance reporting enable/disable support
2011-05-11 15:18:53 -07:00
slub: Fix the lockless code on 32-bit platforms with no 64-bit cmpxchg
2011-05-04 14:20:20 -07:00
Merge branch 'perf/stat' into perf/core
2011-05-06 21:07:38 +02:00
next_pidmap: fix overflow condition
2011-04-18 10:35:30 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-11 13:44:25 -07:00
PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
2011-05-16 20:17:47 +02:00
PM: Introduce generic prepare and complete callbacks for subsystems
2011-05-17 23:26:21 +02:00
PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)
2011-04-30 00:25:44 +02:00
treewide: fix a few typos in comments
2011-05-10 10:16:21 +02:00
timers: Posix interface for alarm-timers
2011-04-26 14:01:46 -07:00
procfs: add stub for proc_mkdir_mode()
2011-05-18 02:55:24 -07:00
pstore: fix pstore filesystem mount/remount issue
2011-05-16 11:05:00 -07:00
Intel PTI implementaiton of MIPI 1149.7.
2011-05-13 16:31:00 -07:00
ptrace: Prepare to fix racy accesses on task breakpoints
2011-04-25 17:28:24 +02:00
timers: Add rb_init_node() to allow for stack allocated rb nodes
2011-04-26 14:01:42 -07:00
list: remove prefetching from regular list iterators
2011-05-19 14:15:29 -07:00
rcu: introduce kfree_rcu()
2011-05-05 23:16:59 -07:00
rcu: provide rcu_virt_note_context_switch() function.
2011-05-05 23:16:59 -07:00
rcu: provide rcu_virt_note_context_switch() function.
2011-05-05 23:16:59 -07:00
rfkill: Regulator consumer driver for rfkill
2011-04-19 15:38:02 -04:00
RapidIO/mpc85xx: fix possible mport registration problems
2011-04-14 16:06:56 -07:00
RapidIO: add IDT CPS-1432 switch definitions
2011-04-14 16:06:56 -07:00
Input: rotary-encoder - add support for half-period encoders
2011-05-12 08:28:47 -07:00
oom: replace PF_OOM_ORIGIN with toggling oom_score_adj
2011-05-25 08:39:10 -07:00
SECURITY: Move exec_permission RCU checks into security modules
2011-04-25 10:20:32 -04:00
seqlock: Don't smp_rmb in seqlock reader spin loop
2011-05-12 12:13:43 +02:00
tty/serial: Add explicit PORT_TEGRA type
2011-05-19 16:51:01 -07:00
tty/serial: Fix break handling for PORT_TEGRA
2011-05-19 16:51:02 -07:00
hwmon: (sht15) add support for CRC validation
2011-05-19 08:19:36 -07:00
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
2011-05-20 13:33:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-05-23 08:39:24 -07:00
slub: Deal with hyperthetical case of PAGE_SIZE > 2M
2011-05-21 12:53:53 +03:00
net: allow shifted access in smsc911x V2
2011-04-13 17:13:00 -07:00
net: Add sendmmsg socket system call
2011-05-05 11:10:14 -07:00
spinlock_up.h: include asm/processor.h in for cpu_relax
2011-05-20 12:51:07 -07:00
net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h
2011-05-03 16:09:40 -07:00
Add a strtobool function matching semantics of existing in kernel equivalents
2011-05-19 16:55:28 +09:30
PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
2011-04-11 22:54:42 +02:00
net: Add sendmmsg socket system call
2011-05-05 11:10:14 -07:00
PM: Remove sysdev suspend, resume and shutdown operations
2011-05-11 21:37:15 +02:00
sysfs: remove "last sysfs file:" line from the oops messages
2011-05-13 16:05:51 -07:00
hrtimers: Avoid touching inactive timer bases
2011-05-23 13:59:54 +02:00
drivers:misc:ti-st: handle delayed tty receive
2011-04-22 17:01:09 -07:00
timerfd: Manage cancelable timers in timerfd
2011-05-23 13:59:53 +02:00
timerfd: Manage cancelable timers in timerfd
2011-05-23 13:59:53 +02:00
timers: Add rb_init_node() to allow for stack allocated rb nodes
2011-04-26 14:01:42 -07:00
tipc: Abort excessive send requests as early as possible
2011-05-10 16:03:56 -04:00
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
2011-05-20 13:33:21 -07:00
n_tracerouter and n_tracesink ldisc additions.
2011-05-13 16:31:00 -07:00
tty: make receive_buf() return the amout of bytes received
2011-04-22 17:31:53 -07:00
USB: documentation update for the pre_reset method
2011-04-29 17:24:29 -07:00
[media] uvcvideo: Make the API public
2011-05-20 09:30:46 -03:00
[media] v4l: Add V4L2_MBUS_FMT_JPEG_1X8 media bus format
2011-05-20 11:28:49 -03:00
[media] v4l: Add M420 format definition
2011-05-20 12:17:35 -03:00
mm, mem-hotplug: update pcp->stat_threshold when memory hotplug occur
2011-05-25 08:39:09 -07:00
wl12xx: Handle platforms without level trigger interrupts
2011-04-19 16:49:20 +03:00
