Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f568865 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge third batch of fixes from Andrew Morton:
 "Most of the rest.  I still have two large patchsets against AIO and
  IPC, but they're a bit stuck behind other trees and I'm about to
  vanish for six days.

   - random fixlets
   - inotify
   - more of the MM queue
   - show_stack() cleanups
   - DMI update
   - kthread/workqueue things
   - compat cleanups
   - epoll udpates
   - binfmt updates
   - nilfs2
   - hfs
   - hfsplus
   - ptrace
   - kmod
   - coredump
   - kexec
   - rbtree
   - pids
   - pidns
   - pps
   - semaphore tweaks
   - some w1 patches
   - relay updates
   - core Kconfig changes
   - sysrq tweaks"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (109 commits)
  Documentation/sysrq: fix inconstistent help message of sysrq key
  ethernet/emac/sysrq: fix inconstistent help message of sysrq key
  sparc/sysrq: fix inconstistent help message of sysrq key
  powerpc/xmon/sysrq: fix inconstistent help message of sysrq key
  ARM/etm/sysrq: fix inconstistent help message of sysrq key
  power/sysrq: fix inconstistent help message of sysrq key
  kgdb/sysrq: fix inconstistent help message of sysrq key
  lib/decompress.c: fix initconst
  notifier-error-inject: fix module names in Kconfig
  kernel/sys.c: make prctl(PR_SET_MM) generally available
  UAPI: remove empty Kbuild files
  menuconfig: print more info for symbol without prompts
  init/Kconfig: re-order CONFIG_EXPERT options to fix menuconfig display
  kconfig menu: move Virtualization drivers near other virtualization options
  Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
  relay: use macro PAGE_ALIGN instead of FIX_SIZE
  kernel/relay.c: move FIX_SIZE macro into relay.c
  kernel/relay.c: remove unused function argument actor
  drivers/w1/slaves/w1_ds2760.c: fix the error handling in w1_ds2760_add_slave()
  drivers/w1/slaves/w1_ds2781.c: fix the error handling in w1_ds2781_add_slave()
  ...
parents f1e9a236 e2a8b0a7

Documentation/sysrq.txt

+10 −10
Original line number Diff line number Diff line
@@ -129,9 +129,9 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 


*  Okay, so what can I use them for?

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Well, un'R'aw is very handy when your X server or a svgalib program crashes.

Well, unraw(r) is very handy when your X server or a svgalib program crashes.



sa'K' (Secure Access Key) is useful when you want to be sure there is no

sak(k) (Secure Access Key) is useful when you want to be sure there is no

trojan program running at console which could grab your password

when you would try to login. It will kill all programs on given console,

thus letting you make sure that the login prompt you see is actually
@@ -143,20 +143,20 @@ IMPORTANT: such. :IMPORTANT 
useful when you want to exit a program that will not let you switch consoles.

(For example, X or a svgalib program.)



re'B'oot is good when you're unable to shut down. But you should also 'S'ync

and 'U'mount first.

reboot(b) is good when you're unable to shut down. But you should also

sync(s) and umount(u) first.



'C'rash can be used to manually trigger a crashdump when the system is hung.

crash(c) can be used to manually trigger a crashdump when the system is hung.

Note that this just triggers a crash if there is no dump mechanism available.



'S'ync is great when your system is locked up, it allows you to sync your

sync(s) is great when your system is locked up, it allows you to sync your

disks and will certainly lessen the chance of data loss and fscking. Note

that the sync hasn't taken place until you see the "OK" and "Done" appear

on the screen. (If the kernel is really in strife, you may not ever get the

OK or Done message...)



'U'mount is basically useful in the same ways as 'S'ync. I generally 'S'ync,

'U'mount, then re'B'oot when my system locks. It's saved me many a fsck.

umount(u) is basically useful in the same ways as sync(s). I generally sync(s),

umount(u), then reboot(b) when my system locks. It's saved me many a fsck.

Again, the unmount (remount read-only) hasn't taken place until you see the

"OK" and "Done" message appear on the screen.
@@ -165,11 +165,11 @@ kernel messages you do not want to see. Selecting '0' will prevent all but 
the most urgent kernel messages from reaching your console. (They will

still be logged if syslogd/klogd are alive, though.)



t'E'rm and k'I'll are useful if you have some sort of runaway process you

term(e) and kill(i) are useful if you have some sort of runaway process you

are unable to kill any other way, especially if it's spawning other

processes.



"'J'ust thaw it" is useful if your system becomes unresponsive due to a frozen

"just thaw it(j)" is useful if your system becomes unresponsive due to a frozen

(probably root) filesystem via the FIFREEZE ioctl.



*  Sometimes SysRq seems to get 'stuck' after using it, what can I do?

arch/alpha/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ machine_power_off(void) 
void

show_regs(struct pt_regs *regs)

{

	show_regs_print_info(KERN_DEFAULT);

	dik_show_regs(regs, NULL);

}

arch/alpha/kernel/traps.c

+0 −7
Original line number Diff line number Diff line
@@ -169,13 +169,6 @@ void show_stack(struct task_struct *task, unsigned long *sp) 
	dik_show_trace(sp);

}



void dump_stack(void)

{

	show_stack(NULL, NULL);

}



EXPORT_SYMBOL(dump_stack);



void

die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)

{

arch/arc/kernel/stacktrace.c

+0 −7
Original line number Diff line number Diff line
@@ -220,13 +220,6 @@ void show_stack(struct task_struct *tsk, unsigned long *sp) 
	show_stacktrace(tsk, NULL);

}



/* Expected by Rest of kernel code */

void dump_stack(void)

{

	show_stacktrace(NULL, NULL);

}

EXPORT_SYMBOL(dump_stack);



/* Another API expected by schedular, shows up in "ps" as Wait Channel

 * Ofcourse just returning schedule( ) would be pointless so unwind until

 * the function is not in schedular code

arch/arc/kernel/troubleshoot.c

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void print_task_path_n_nm(struct task_struct *tsk, char *buf) 
	}



done:

	pr_info("%s, TGID %u\n", path_nm, tsk->tgid);

	pr_info("Path: %s\n", path_nm);

}

EXPORT_SYMBOL(print_task_path_n_nm);
@@ -163,6 +163,7 @@ void show_regs(struct pt_regs *regs) 
		return;



	print_task_path_n_nm(tsk, buf);

	show_regs_print_info(KERN_INFO);



	if (current->thread.cause_code)

		show_ecr_verbose(regs);