diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-21 14:28:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-21 14:28:24 -0700 |
commit | 46097f27180c7dd371c2b0391d40bb1fa36007af (patch) | |
tree | 55a202d3ba3fd24e5d4afa286cefa72ec01ebcd1 /arch/parisc/include/uapi/asm/errno.h | |
parent | 4ec656bdf43a13a655a8259b79dd63bc1f0b1e41 (diff) | |
parent | 3eb53b20d7bd1374598cfb1feaa081fcac0e76cd (diff) | |
download | linux-stable-46097f27180c7dd371c2b0391d40bb1fa36007af.tar.gz linux-stable-46097f27180c7dd371c2b0391d40bb1fa36007af.tar.bz2 linux-stable-46097f27180c7dd371c2b0391d40bb1fa36007af.zip |
Merge branch 'parisc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull two parisc fixes from Helge Deller:
"The first patch ensures that the high-res cr16 clocksource (which was
added in kernel 4.7) gets choosen as default clocksource for parisc.
The second patch moves the #define of EREFUSED down inside errno.h and
thus unbreaks building the gccgo compiler"
* 'parisc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix order of EREFUSED define in errno.h
parisc: Fix automatic selection of cr16 clocksource
Diffstat (limited to 'arch/parisc/include/uapi/asm/errno.h')
-rw-r--r-- | arch/parisc/include/uapi/asm/errno.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/include/uapi/asm/errno.h b/arch/parisc/include/uapi/asm/errno.h index c0ae62520d15..274d5bc6ecce 100644 --- a/arch/parisc/include/uapi/asm/errno.h +++ b/arch/parisc/include/uapi/asm/errno.h @@ -97,10 +97,10 @@ #define ENOTCONN 235 /* Transport endpoint is not connected */ #define ESHUTDOWN 236 /* Cannot send after transport endpoint shutdown */ #define ETOOMANYREFS 237 /* Too many references: cannot splice */ -#define EREFUSED ECONNREFUSED /* for HP's NFS apparently */ #define ETIMEDOUT 238 /* Connection timed out */ #define ECONNREFUSED 239 /* Connection refused */ -#define EREMOTERELEASE 240 /* Remote peer released connection */ +#define EREFUSED ECONNREFUSED /* for HP's NFS apparently */ +#define EREMOTERELEASE 240 /* Remote peer released connection */ #define EHOSTDOWN 241 /* Host is down */ #define EHOSTUNREACH 242 /* No route to host */ |