linux-next: manual merge of the akpm-current tree with the ftrace tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
kernel/printk/printk.c between commit afdc34a3d3b8 ("printk: Add
per_cpu printk func to allow printk to be diverted") from the ftrace
tree and commit b59ed413b21b ("printk: add and use LOGLEVEL_<level>
defines for KERN_<LEVEL> equivalents") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/printk/printk.c
index 35c4b2232d6d,218ea26d75b8..000000000000
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -1807,30 -1805,6 +1805,30 @@@ asmlinkage int printk_emit(int facility
  }
  EXPORT_SYMBOL(printk_emit);
  
 +int vprintk_default(const char *fmt, va_list args)
 +{
 +	int r;
 +
 +#ifdef CONFIG_KGDB_KDB
 +	if (unlikely(kdb_trap_printk)) {
 +		r = vkdb_printf(fmt, args);
 +		return r;
 +	}
 +#endif
- 	r = vprintk_emit(0, -1, NULL, 0, fmt, args);
++	r = vprintk_emit(0, LOGLEVEL_DEFAULT, NULL, 0, fmt, args);
 +
 +	return r;
 +}
 +EXPORT_SYMBOL_GPL(vprintk_default);
 +
 +/*
 + * This allows printk to be diverted to another function per cpu.
 + * This is useful for calling printk functions from within NMI
 + * without worrying about race conditions that can lock up the
 + * box.
 + */
 +DEFINE_PER_CPU(printk_func_t, printk_func) = vprintk_default;
 +
  /**
   * printk - print a kernel message
   * @fmt: format string

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]