diff options
author | 2012-10-31 13:36:18 +0100 | |
---|---|---|
committer | 2012-10-31 13:36:18 +0100 | |
commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /include/linux/kdev_t.h | |
parent | KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte() (diff) | |
parent | KVM: do not treat noslot pfn as a error pfn (diff) | |
download | linux-dev-0588000eac9ba4178cebade437da3b28e8fad48f.tar.xz linux-dev-0588000eac9ba4178cebade437da3b28e8fad48f.zip |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'include/linux/kdev_t.h')
-rw-r--r-- | include/linux/kdev_t.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h index 2dacab8beccb..c838abe3ee0a 100644 --- a/include/linux/kdev_t.h +++ b/include/linux/kdev_t.h @@ -1,6 +1,8 @@ #ifndef _LINUX_KDEV_T_H #define _LINUX_KDEV_T_H -#ifdef __KERNEL__ + +#include <uapi/linux/kdev_t.h> + #define MINORBITS 20 #define MINORMASK ((1U << MINORBITS) - 1) @@ -87,14 +89,4 @@ static inline unsigned sysv_minor(u32 dev) return dev & 0x3ffff; } -#else /* __KERNEL__ */ - -/* -Some programs want their definitions of MAJOR and MINOR and MKDEV -from the kernel sources. These must be the externally visible ones. -*/ -#define MAJOR(dev) ((dev)>>8) -#define MINOR(dev) ((dev) & 0xff) -#define MKDEV(ma,mi) ((ma)<<8 | (mi)) -#endif /* __KERNEL__ */ #endif |