diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-03-31 09:48:00 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-03-31 09:48:00 +0200 |
| commit | 9005615bafbe03075f4e4fe10874b7abe1918782 (patch) | |
| tree | 25e73a4d8de8266346bb140b75ba0436080e5ab3 /fs/afs/misc.c | |
| parent | 016da20148a1692e34d35d1f1787400a2a2d2c58 (diff) | |
| parent | 0107042768658fea9f5f5a9c00b1c90f5dab6a06 (diff) | |
Merge branch 'fortglx/4.12/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping changes from John Stultz:
Main changes are the initial steps of Nicoli's work to make the clockevent
timers be corrected for NTP adjustments. Then a few smaller fixes that
I've queued, and adding Stephen Boyd to the maintainers list for
timekeeping.
Diffstat (limited to 'fs/afs/misc.c')
| -rw-r--r-- | fs/afs/misc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/afs/misc.c b/fs/afs/misc.c index 91ea1aa0d8b3..100b207efc9e 100644 --- a/fs/afs/misc.c +++ b/fs/afs/misc.c @@ -84,6 +84,8 @@ int afs_abort_to_error(u32 abort_code) case RXKADDATALEN: return -EKEYREJECTED; case RXKADILLEGALLEVEL: return -EKEYREJECTED; + case RXGEN_OPCODE: return -ENOTSUPP; + default: return -EREMOTEIO; } } |