diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 13:15:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 13:15:12 -0800 |
| commit | 61de8e53640ceeda564a65170a46c1edc2b37e11 (patch) | |
| tree | f5b28f510ba8b6515fbdf67a4d81eccdeae742f5 /include | |
| parent | Merge tag 'trace-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | selftest: size: Add size test for Linux kernel (diff) | |
| download | wireguard-linux-61de8e53640ceeda564a65170a46c1edc2b37e11.tar.xz wireguard-linux-61de8e53640ceeda564a65170a46c1edc2b37e11.zip | |
Merge tag 'linux-kselftest-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest update from Shuah Khan:
"kselftest updates for 3.19-rc1:
- kcmp test include file cleanup
- kcmp change to build on all architectures
- A light weight kselftest framework that provides a set of
interfaces for tests to use to report results. In addition,
several tests are updated to use the framework.
- A new runtime system size test that prints the amount of RAM that
the currently running system is using"
* tag 'linux-kselftest-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftest: size: Add size test for Linux kernel
selftests/kcmp: Always try to build the test
selftests/kcmp: Don't include kernel headers
kcmp: Move kcmp.h into uapi
selftests/timers: change test to use ksft framework
selftests/kcmp: change test to use ksft framework
selftests/ipc: change test to use ksft framework
selftests/breakpoints: change test to use ksft framework
selftests: add kselftest framework for uniform test reporting
selftests/user: move test out of Makefile into a shell script
selftests/net: move test out of Makefile into a shell script
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/kcmp.h (renamed from include/linux/kcmp.h) | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index cea258f1d9d2..259d31fc9073 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -212,6 +212,7 @@ header-y += ivtv.h header-y += ixjuser.h header-y += jffs2.h header-y += joystick.h +header-y += kcmp.h header-y += kdev_t.h header-y += kd.h header-y += kernelcapi.h diff --git a/include/linux/kcmp.h b/include/uapi/linux/kcmp.h index 2dcd1b3aafc8..84df14b37360 100644 --- a/include/linux/kcmp.h +++ b/include/uapi/linux/kcmp.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_KCMP_H -#define _LINUX_KCMP_H +#ifndef _UAPI_LINUX_KCMP_H +#define _UAPI_LINUX_KCMP_H /* Comparison type */ enum kcmp_type { @@ -14,4 +14,4 @@ enum kcmp_type { KCMP_TYPES, }; -#endif /* _LINUX_KCMP_H */ +#endif /* _UAPI_LINUX_KCMP_H */ |