diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-05 20:32:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-05 20:32:25 -0500 |
| commit | 2a055ea53260ac8addeeb94eb671172844bc9106 (patch) | |
| tree | 5998b40de7145d98b553d7eb78b7a16be79aac75 /include/linux | |
| parent | 9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1 (diff) | |
| parent | b288cd9600724ad3a0e55c8786e70741dd13deae (diff) | |
| download | u-boot-2a055ea53260ac8addeeb94eb671172844bc9106.tar.gz | |
Merge tag 'dm-pull-5dec18' of git://git.denx.de/u-boot-dm
Minor sandbox enhancements / fixes
tpm improvements to clear up v1/v2 support
buildman toolchain fixes
New serial options to set/get config
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/delay.h | 3 | ||||
| -rw-r--r-- | include/linux/kernel.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/delay.h b/include/linux/delay.h index 193603451a..71a38e15fb 100644 --- a/include/linux/delay.h +++ b/include/linux/delay.h @@ -10,8 +10,7 @@ void udelay(unsigned long usec); static inline void mdelay(unsigned long msec) { - while (msec--) - udelay(1000); + udelay(1000 * msec); } static inline void ndelay(unsigned long nsec) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 04a09eb4f6..bd88483b9f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -33,6 +33,10 @@ #define S64_MAX ((s64)(U64_MAX>>1)) #define S64_MIN ((s64)(-S64_MAX - 1)) +/* Aliases defined by stdint.h */ +#define UINT32_MAX U32_MAX +#define UINT64_MAX U64_MAX + #define STACK_MAGIC 0xdeadbeef #define REPEAT_BYTE(x) ((~0ul / 0xff) * (x)) |