diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:12:42 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:13:05 -0500 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /fs/lockd/mon.c | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'fs/lockd/mon.c')
| -rw-r--r-- | fs/lockd/mon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 23d7451b2938..65ba36b80a9e 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c | |||
| @@ -55,7 +55,7 @@ static DEFINE_SPINLOCK(nsm_lock); | |||
| 55 | * Local NSM state | 55 | * Local NSM state |
| 56 | */ | 56 | */ |
| 57 | u32 __read_mostly nsm_local_state; | 57 | u32 __read_mostly nsm_local_state; |
| 58 | int __read_mostly nsm_use_hostnames; | 58 | bool __read_mostly nsm_use_hostnames; |
| 59 | 59 | ||
| 60 | static inline struct sockaddr *nsm_addr(const struct nsm_handle *nsm) | 60 | static inline struct sockaddr *nsm_addr(const struct nsm_handle *nsm) |
| 61 | { | 61 | { |