diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
| commit | 7c2517c2444fdd5c2eceee330a03ff15d12602ca (patch) | |
| tree | 1770d5217d689f0513bb1534c7e4dfbf114800fc /include | |
| parent | cbc25b2b8488452085d3195dfc7164b00a265364 (diff) | |
| parent | 0473048c4fa5410b0c4a75f667f7b317e44c15df (diff) | |
| download | barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.gz barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/libgcc.h | 1 | ||||
| -rw-r--r-- | include/linux/time.h | 6 | ||||
| -rw-r--r-- | include/printk.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/lib/libgcc.h b/include/lib/libgcc.h index adad27704a..f7b9be61f6 100644 --- a/include/lib/libgcc.h +++ b/include/lib/libgcc.h @@ -43,5 +43,6 @@ typedef union { long long __lshrdi3(long long u, word_type b); long long __ashldi3(long long u, word_type b); long long __ashrdi3(long long u, word_type b); +long long __muldi3(long long u, long long v); #endif /* __ASM_LIBGCC_H */ diff --git a/include/linux/time.h b/include/linux/time.h index 3a1bb50020..7903139a65 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -3,7 +3,13 @@ #include <linux/types.h> +#define MSEC_PER_SEC 1000L +#define USEC_PER_MSEC 1000L +#define NSEC_PER_USEC 1000L +#define NSEC_PER_MSEC 1000000L +#define USEC_PER_SEC 1000000L #define NSEC_PER_SEC 1000000000L +#define FSEC_PER_SEC 1000000000000000LL struct timespec { time_t tv_sec; /* seconds */ diff --git a/include/printk.h b/include/printk.h index aaad07552e..ab2c64cf3c 100644 --- a/include/printk.h +++ b/include/printk.h @@ -119,7 +119,7 @@ static inline void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, int rowsize, int groupsize, const void *buf, size_t len, bool ascii) { - memory_display(buf, 0, len, 4, 0); + memory_display(buf, 0, len, groupsize, 0); } struct log_entry { |