diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 14:08:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 14:08:06 -0500 |
| commit | b8155fe1b2963ab2c53140929eb2362afcb9ccfe (patch) | |
| tree | 5e63f57ce23f68094676205059bb53df4b7b5ec3 /drivers/misc | |
| parent | 7addb7fa1085e29398c2aef43f0b98c3c4b7e749 (diff) | |
| parent | 37c5e942bb2eedd98c1cd1fa1f94d79f6b830c38 (diff) | |
Merge tag 'powerpc-4.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- cxl: Fix PSL timebase synchronization detection from Frederic Barrat
- Fix oops when destroying hw_breakpoint event from Ravi Bangoria
- Avoid lbarx on e5500 from Scott Wood
* tag 'powerpc-4.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/fsl-book3e: Avoid lbarx on e5500
powerpc/hw_breakpoint: Fix oops when destroying hw_breakpoint event
cxl: Fix PSL timebase synchronization detection
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cxl/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 4c1903f781fc..0c6c17a1c59e 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c | |||
| @@ -415,7 +415,7 @@ static int cxl_setup_psl_timebase(struct cxl *adapter, struct pci_dev *dev) | |||
| 415 | delta = mftb() - psl_tb; | 415 | delta = mftb() - psl_tb; |
| 416 | if (delta < 0) | 416 | if (delta < 0) |
| 417 | delta = -delta; | 417 | delta = -delta; |
| 418 | } while (cputime_to_usecs(delta) > 16); | 418 | } while (tb_to_ns(delta) > 16000); |
| 419 | 419 | ||
| 420 | return 0; | 420 | return 0; |
| 421 | } | 421 | } |