---

yaml
---
r: 6935
b: refs/heads/master
c: b749bfc
h: refs/heads/master
i:
  6933: 0fde5db
  6931: 004c70f
  6927: 8e32ef5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f54bef9e9c84c8dc656c55dc96c1da7b6d1c53d8
+refs/heads/master: b749bfcd1be72f8cb8310e1cac12825bda029432

trunk/arch/ppc64/Kconfig.debug

@@ -41,10 +41,19 @@ config XMON
 	help
 	  Include in-kernel hooks for the xmon kernel monitor/debugger.
 	  Unless you are intending to debug the kernel, say N here.
+	  Make sure to enable also CONFIG_BOOTX_TEXT on Macs. Otherwise
+	  nothing will appear on the screen (xmon writes directly to the
+	  framebuffer memory).
+	  The cmdline option 'xmon' or 'xmon=early' will drop into xmon very
+	  early during boot. 'xmon=on' will just enable the xmon debugger hooks.
+	  'xmon=off' will disable the debugger hooks if CONFIG_XMON_DEFAULT is set.
 
 config XMON_DEFAULT
 	bool "Enable xmon by default"
 	depends on XMON
+	help
+	  xmon is normally disabled unless booted with 'xmon=on'.
+	  Use 'xmon=off' to disable xmon init during runtime.
 
 config PPCDBG
 	bool "Include PPCDBG realtime debugging"