diff options
| author | Todd Poynor <tpoynor@mvista.com> | 2005-07-11 22:34:39 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-12 18:58:44 -0400 |
| commit | a98a5d04f400ad112e59cadd739dbabf89417e60 (patch) | |
| tree | 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e /drivers/char/sysrq.c | |
| parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
| parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) | |
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index af79805b5576..12d563c648f7 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -228,7 +228,7 @@ static struct sysrq_key_op sysrq_term_op = { | |||
| 228 | 228 | ||
| 229 | static void moom_callback(void *ignored) | 229 | static void moom_callback(void *ignored) |
| 230 | { | 230 | { |
| 231 | out_of_memory(GFP_KERNEL); | 231 | out_of_memory(GFP_KERNEL, 0); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | static DECLARE_WORK(moom_work, moom_callback, NULL); | 234 | static DECLARE_WORK(moom_work, moom_callback, NULL); |