diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 09:13:04 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 09:13:04 +0200 |
| commit | fa251f89903d73989e2f63e13d0eaed1e07ce0da (patch) | |
| tree | 3f7fe779941e3b6d67754dd7c44a32f48ea47c74 /arch/sparc/kernel/process_64.c | |
| parent | dd3932eddf428571762596e17b65f5dc92ca361b (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
| download | op-kernel-dev-fa251f89903d73989e2f63e13d0eaed1e07ce0da.zip op-kernel-dev-fa251f89903d73989e2f63e13d0eaed1e07ce0da.tar.gz | |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'arch/sparc/kernel/process_64.c')
| -rw-r--r-- | arch/sparc/kernel/process_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index 485f547..c158a95 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -303,7 +303,7 @@ void arch_trigger_all_cpu_backtrace(void) #ifdef CONFIG_MAGIC_SYSRQ -static void sysrq_handle_globreg(int key, struct tty_struct *tty) +static void sysrq_handle_globreg(int key) { arch_trigger_all_cpu_backtrace(); } |
