Skip to content

Commit

Permalink
smb.h: do not include linux/time.h in userspace
Browse files Browse the repository at this point in the history
linux/time.h conflicts with time.h from glibc

It breaks building smbmount from samba.  It's regression introduced by
commit 76308da (" smb.h: uses struct timespec but didn't include
linux/time.h").

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: <stable@kernel.org>             [2.6.26.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Kirill A. Shutemov authored and Linus Torvalds committed Sep 23, 2008
1 parent 683f40d commit c32a162
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/linux/smb.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@

#include <linux/types.h>
#include <linux/magic.h>
#ifdef __KERNEL__
#include <linux/time.h>
#endif

enum smb_protocol {
SMB_PROTOCOL_NONE,
Expand Down

0 comments on commit c32a162

Please sign in to comment.