diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-06 16:45:46 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-06 16:45:46 -0500 |
| commit | d79ae6aa3087a6434b5ecdb51d20dca20c8e1596 (patch) | |
| tree | ef06de49134213591e529ece83d4cec3095e893e /include/linux/time.h | |
| parent | bead4f2f2c85e1bf39d2c80ef733f1325eb336bb (diff) | |
| parent | fb013eee68d08403572ef3c579f6688bbe33fd47 (diff) | |
Merge branch '2019-12-06-master-imports'
- Allow for the sysboot command, which is used to parse extlinux.conf
files to be used without PXE support. There is no functional change
here aside from fixing distro boot in a few cases where we actually
lacked the ability to parse the extlinux.conf file
- Add the x509/pkcs7 parsers from Linux, a pre-requisite to EFI Secure
Boot support.
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index b8d298eb4d..702dd276ae 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -1,6 +1,8 @@ #ifndef _LINUX_TIME_H #define _LINUX_TIME_H +#include <rtc.h> +#include <vsprintf.h> #include <linux/types.h> #define _DEFUN(a,b,c) a(c) @@ -150,4 +152,13 @@ _DEFUN (ctime_r, (tim_p, result), return asctime_r (localtime_r (tim_p, &tm), result); } +/* for compatibility with linux code */ +typedef __s64 time64_t; + +#ifdef CONFIG_LIB_DATE +time64_t mktime64(const unsigned int year, const unsigned int mon, + const unsigned int day, const unsigned int hour, + const unsigned int min, const unsigned int sec); +#endif + #endif |