diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-08 02:13:43 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 02:13:43 (GMT) |
| commit | 62cd2fa82a38cb3d653517822c62a39cdbb5f365 (patch) | |
| tree | b5d2f198c14455822c8b03abde2c8d8080cda24a /fs/dlm/user.c | |
| parent | 6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7 (diff) | |
| parent | ae1287865f5361fa138d4d3b1b6277908b54eac9 (diff) | |
| download | linux-62cd2fa82a38cb3d653517822c62a39cdbb5f365.tar.xz | |
Merge branch 'console-fixes' into drm-next
(not the fbcon maintainer pull 2)
fix bug in vgacon on bootup and fbcon losing fonts on startup.
* console-fixes: (50 commits)
fbcon: don't lose the console font across generic->chip driver switch
vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 7ff4985..911649a 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -503,11 +503,11 @@ static ssize_t device_write(struct file *file, const char __user *buf, #endif return -EINVAL; -#ifdef CONFIG_COMPAT - if (count > sizeof(struct dlm_write_request32) + DLM_RESNAME_MAXLEN) -#else + /* + * can't compare against COMPAT/dlm_write_request32 because + * we don't yet know if is64bit is zero + */ if (count > sizeof(struct dlm_write_request) + DLM_RESNAME_MAXLEN) -#endif return -EINVAL; kbuf = kzalloc(count + 1, GFP_NOFS); |