diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2019-02-14 17:46:56 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-02-14 17:46:56 +0100 |
| commit | 338618ad2a01b821a34e089a6607143fb283dee3 (patch) | |
| tree | adf9aff96a5a087c820251f3eb09928b3271b007 /arch/x86/lib/kaslr.c | |
| parent | 18769445ca55c2277d29e35ffda7e9a206b1758f (diff) | |
| parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
| download | lwn-338618ad2a01b821a34e089a6607143fb283dee3.tar.gz lwn-338618ad2a01b821a34e089a6607143fb283dee3.zip | |
Merge branch 'i2c/for-current' into i2c/for-5.1
Diffstat (limited to 'arch/x86/lib/kaslr.c')
| -rw-r--r-- | arch/x86/lib/kaslr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/kaslr.c b/arch/x86/lib/kaslr.c index 79778ab200e4..a53665116458 100644 --- a/arch/x86/lib/kaslr.c +++ b/arch/x86/lib/kaslr.c @@ -36,8 +36,8 @@ static inline u16 i8254(void) u16 status, timer; do { - outb(I8254_PORT_CONTROL, - I8254_CMD_READBACK | I8254_SELECT_COUNTER0); + outb(I8254_CMD_READBACK | I8254_SELECT_COUNTER0, + I8254_PORT_CONTROL); status = inb(I8254_PORT_COUNTER0); timer = inb(I8254_PORT_COUNTER0); timer |= inb(I8254_PORT_COUNTER0) << 8; |