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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/lglock.h between commit 4314ff760e8b ("no need to keep
brlock macros anymore...") from the vfs tree and commit f5639052d567
("lglock: map to spinlock when !CONFIG_SMP") 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@xxxxxxxxxxxxxxxx

diff --cc include/linux/lglock.h
index 96549abe8842,6561b1c0fa63..000000000000
--- a/include/linux/lglock.h
+++ b/include/linux/lglock.h
@@@ -25,6 -25,18 +25,8 @@@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
  
 -/* can make br locks by using local lock for read side, global lock for write */
 -#define br_lock_init(name)	lg_lock_init(name, #name)
 -#define br_read_lock(name)	lg_local_lock(name)
 -#define br_read_unlock(name)	lg_local_unlock(name)
 -#define br_write_lock(name)	lg_global_lock(name)
 -#define br_write_unlock(name)	lg_global_unlock(name)
 -
 -#define DEFINE_BRLOCK(name)		DEFINE_LGLOCK(name)
 -#define DEFINE_STATIC_BRLOCK(name)	DEFINE_STATIC_LGLOCK(name)
 -
+ #ifdef CONFIG_SMP
+ 
  #ifdef CONFIG_DEBUG_LOCK_ALLOC
  #define LOCKDEP_INIT_MAP lockdep_init_map
  #else

Attachment: pgp00000.pgp
Description: PGP signature